upgrade agents to 1.8

youyk · youyk · commit dc838d64a126 · 2016-11-08T08:51:46.000+08:00
diff --git a/build/pom.xml b/build/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>build</artifactId>
diff --git a/compute/pom.xml b/compute/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>zstack</artifactId>
 		<groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>compute</artifactId>
diff --git a/configuration/pom.xml b/configuration/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>configuration</artifactId>
diff --git a/console/pom.xml b/console/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/console/src/main/java/org/zstack/console/ConsoleGlobalProperty.java b/console/src/main/java/org/zstack/console/ConsoleGlobalProperty.java
@@ -7,6 +7,6 @@
  */
 @GlobalPropertyDefinition
 public class ConsoleGlobalProperty {
-    @GlobalProperty(name="ConsoleProxy.agentPackageName", defaultValue = "consoleproxy-1.7.tar.gz")
+    @GlobalProperty(name="ConsoleProxy.agentPackageName", defaultValue = "consoleproxy-1.8.tar.gz")
     public static String AGENT_PACKAGE_NAME;
 }
diff --git a/core/pom.xml b/core/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
         <artifactId>zstack</artifactId>
     </parent>
diff --git a/core/src/main/java/org/zstack/core/ansible/AnsibleGlobalProperty.java b/core/src/main/java/org/zstack/core/ansible/AnsibleGlobalProperty.java
@@ -9,7 +9,7 @@
 public class AnsibleGlobalProperty {
     @GlobalProperty(name = "Ansible.executable", defaultValue = "python")
     public static String EXECUTABLE;
-    @GlobalProperty(name = "Ansible.zstacklibPackageName", defaultValue = "zstacklib-1.7.tar.gz")
+    @GlobalProperty(name = "Ansible.zstacklibPackageName", defaultValue = "zstacklib-1.8.tar.gz")
     public static String ZSTACKLIB_PACKAGE_NAME;
     @GlobalProperty(name = "Ansible.zstackRoot", defaultValue = "/var/lib/zstack/")
     public static String ZSTACK_ROOT;
diff --git a/header/pom.xml b/header/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>header</artifactId>
diff --git a/identity/pom.xml b/identity/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>zstack</artifactId>
 		<groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>identity</artifactId>
diff --git a/image/pom.xml b/image/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>zstack</artifactId>
     <groupId>org.zstack</groupId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>image</artifactId>
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.zstack</groupId>
 			<artifactId>compute</artifactId>
-			<version>1.7.0</version>
+			<version>1.8.0</version>
 		</dependency>
 	</dependencies>
   
diff --git a/network/pom.xml b/network/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>zstack</artifactId>
     <groupId>org.zstack</groupId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>network</artifactId>
diff --git a/plugin/applianceVm/pom.xml b/plugin/applianceVm/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>applianceVm</artifactId>
diff --git a/plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmGlobalProperty.java b/plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmGlobalProperty.java
@@ -11,7 +11,7 @@ public class ApplianceVmGlobalProperty {
     public static boolean NO_ROLLBACK_ON_POST_FAILURE;
     @GlobalProperty(name = "ApplianceVm.connectVerbose", defaultValue = "false")
     public static boolean CONNECT_VERBOSE;
-    @GlobalProperty(name="ApplianceVm.agentPackageName", defaultValue = "appliancevm-1.7.tar.gz")
+    @GlobalProperty(name="ApplianceVm.agentPackageName", defaultValue = "appliancevm-1.8.tar.gz")
     public static String AGENT_PACKAGE_NAME;
     @GlobalProperty(name="ApplianceVm.agentPort", defaultValue = "7759")
     public static int AGENT_PORT;
diff --git a/plugin/ceph/pom.xml b/plugin/ceph/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/ceph/src/main/java/org/zstack/storage/ceph/CephGlobalProperty.java b/plugin/ceph/src/main/java/org/zstack/storage/ceph/CephGlobalProperty.java
@@ -12,13 +12,13 @@ public class CephGlobalProperty {
     public static int BACKUP_STORAGE_AGENT_PORT;
     @GlobalProperty(name="Ceph.primaryStorageAgent.port", defaultValue = "7762")
     public static int PRIMARY_STORAGE_AGENT_PORT;
-    @GlobalProperty(name="Ceph.backupStorage.agentPackageName", defaultValue = "cephbackupstorage-1.7.tar.gz")
+    @GlobalProperty(name="Ceph.backupStorage.agentPackageName", defaultValue = "cephbackupstorage-1.8.tar.gz")
     public static String BACKUP_STORAGE_PACKAGE_NAME;
     @GlobalProperty(name="Ceph.backupStorage.ansiblePlaybook", defaultValue = "cephb.py")
     public static String BACKUP_STORAGE_PLAYBOOK_NAME;
     @GlobalProperty(name="Ceph.backupStorage.ansibleModulePath", defaultValue = "ansible/cephb")
     public static String BACKUP_STORAGE_MODULE_PATH;
-    @GlobalProperty(name="Ceph.primaryStorage.agentPackageName", defaultValue = "cephprimarystorage-1.7.tar.gz")
+    @GlobalProperty(name="Ceph.primaryStorage.agentPackageName", defaultValue = "cephprimarystorage-1.8.tar.gz")
     public static String PRIMARY_STORAGE_PACKAGE_NAME;
     @GlobalProperty(name="Ceph.primaryStorage.ansiblePlaybook", defaultValue = "cephp.py")
     public static String PRIMARY_STORAGE_PLAYBOOK_NAME;
diff --git a/plugin/eip/pom.xml b/plugin/eip/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/flatNetworkProvider/pom.xml b/plugin/flatNetworkProvider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/fusionstor/pom.xml b/plugin/fusionstor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/fusionstor/src/main/java/org/zstack/storage/fusionstor/FusionstorGlobalProperty.java b/plugin/fusionstor/src/main/java/org/zstack/storage/fusionstor/FusionstorGlobalProperty.java
@@ -12,13 +12,13 @@ public class FusionstorGlobalProperty {
     public static int BACKUP_STORAGE_AGENT_PORT;
     @GlobalProperty(name="Fusionstor.primaryStorageAgent.port", defaultValue = "7764")
     public static int PRIMARY_STORAGE_AGENT_PORT;
-    @GlobalProperty(name="Fusionstor.backupStorage.agentPackageName", defaultValue = "fusionstorbackupstorage-1.7.tar.gz")
+    @GlobalProperty(name="Fusionstor.backupStorage.agentPackageName", defaultValue = "fusionstorbackupstorage-1.8.tar.gz")
     public static String BACKUP_STORAGE_PACKAGE_NAME;
     @GlobalProperty(name="Fusionstor.backupStorage.ansiblePlaybook", defaultValue = "fusionstorb.py")
     public static String BACKUP_STORAGE_PLAYBOOK_NAME;
     @GlobalProperty(name="Fusionstor.backupStorage.ansibleModulePath", defaultValue = "ansible/fusionstorb")
     public static String BACKUP_STORAGE_MODULE_PATH;
-    @GlobalProperty(name="Fusionstor.primaryStorage.agentPackageName", defaultValue = "fusionstorprimarystorage-1.7.tar.gz")
+    @GlobalProperty(name="Fusionstor.primaryStorage.agentPackageName", defaultValue = "fusionstorprimarystorage-1.8.tar.gz")
     public static String PRIMARY_STORAGE_PACKAGE_NAME;
     @GlobalProperty(name="Fusionstor.primaryStorage.ansiblePlaybook", defaultValue = "fusionstorp.py")
     public static String PRIMARY_STORAGE_PLAYBOOK_NAME;
diff --git a/plugin/iscsiPrimaryStorage/pom.xml b/plugin/iscsiPrimaryStorage/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/iscsiPrimaryStorage/src/main/java/org/zstack/storage/primary/iscsi/IscsiFileSystemBackendPrimaryStorageGlobalProperty.java b/plugin/iscsiPrimaryStorage/src/main/java/org/zstack/storage/primary/iscsi/IscsiFileSystemBackendPrimaryStorageGlobalProperty.java
@@ -10,7 +10,7 @@
 public class IscsiFileSystemBackendPrimaryStorageGlobalProperty {
     @GlobalProperty(name = "IscsiFileSystemBackendPrimaryStorage.agentPort", defaultValue = "7760")
     public static int AGENT_PORT;
-    @GlobalProperty(name = "IscsiFileSystemBackendPrimaryStorage.agentPackageName", defaultValue = "iscsifilesystemagent-1.7.tar.gz")
+    @GlobalProperty(name = "IscsiFileSystemBackendPrimaryStorage.agentPackageName", defaultValue = "iscsifilesystemagent-1.8.tar.gz")
     public static String AGENT_PACKAGE_NAME;
     @GlobalProperty(name = "IscsiFileSystemBackendPrimaryStorage.ansiblePlaybook", defaultValue = "iscsi.py")
     public static String ANSIBLE_PLAYBOOK_NAME;
diff --git a/plugin/kvm/pom.xml b/plugin/kvm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>kvm</artifactId>
diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMGlobalProperty.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMGlobalProperty.java
@@ -7,7 +7,7 @@
  */
 @GlobalPropertyDefinition
 public class KVMGlobalProperty {
-    @GlobalProperty(name="KvmAgent.agentPackageName", defaultValue = "kvmagent-1.7.tar.gz")
+    @GlobalProperty(name="KvmAgent.agentPackageName", defaultValue = "kvmagent-1.8.tar.gz")
     public static String AGENT_PACKAGE_NAME;
     @GlobalProperty(name="KvmAgent.agentUrlRootPath", defaultValue = "")
     public static String AGENT_URL_ROOT_PATH;
diff --git a/plugin/ldap/pom.xml b/plugin/ldap/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/loadBalancer/pom.xml b/plugin/loadBalancer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/localstorage/pom.xml b/plugin/localstorage/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/mediator/pom.xml b/plugin/mediator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/nfsPrimaryStorage/pom.xml b/plugin/nfsPrimaryStorage/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>nfsPrimaryStorage</artifactId>
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>plugin</artifactId>
diff --git a/plugin/portForwarding/pom.xml b/plugin/portForwarding/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.zstack</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
 
     <artifactId>portForwarding</artifactId>
diff --git a/plugin/securityGroup/pom.xml b/plugin/securityGroup/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.zstack</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <artifactId>securityGroup</artifactId>
     <dependencies>
diff --git a/plugin/sftpBackupStorage/pom.xml b/plugin/sftpBackupStorage/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>sftpBackupStorage</artifactId>
diff --git a/plugin/sftpBackupStorage/src/main/java/org/zstack/storage/backup/sftp/SftpBackupStorageGlobalProperty.java b/plugin/sftpBackupStorage/src/main/java/org/zstack/storage/backup/sftp/SftpBackupStorageGlobalProperty.java
@@ -8,7 +8,7 @@
 
 @GlobalPropertyDefinition
 public class SftpBackupStorageGlobalProperty {
-    @GlobalProperty(name="SftpBackupStorage.agentPackageName", defaultValue = "sftpbackupstorage-1.7.tar.gz")
+    @GlobalProperty(name="SftpBackupStorage.agentPackageName", defaultValue = "sftpbackupstorage-1.8.tar.gz")
     public static String AGENT_PACKAGE_NAME;
     @GlobalProperty(name="SftpBackupStorage.agentPort", defaultValue = "7171")
     public static int AGENT_PORT;
diff --git a/plugin/sharedMountPointPrimaryStorage/pom.xml b/plugin/sharedMountPointPrimaryStorage/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/vip/pom.xml b/plugin/vip/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugin/virtualRouterProvider/pom.xml b/plugin/virtualRouterProvider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.zstack</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
     <artifactId>virtualRouterProvider</artifactId>
 
diff --git a/plugin/virtualRouterProvider/src/main/java/org/zstack/network/service/virtualrouter/VirtualRouterGlobalProperty.java b/plugin/virtualRouterProvider/src/main/java/org/zstack/network/service/virtualrouter/VirtualRouterGlobalProperty.java
@@ -9,7 +9,7 @@
  */
 @GlobalPropertyDefinition
 public class VirtualRouterGlobalProperty {
-    @GlobalProperty(name="VirtualRouter.agentPackageName", defaultValue = "virtualrouter-1.7.tar.gz")
+    @GlobalProperty(name="VirtualRouter.agentPackageName", defaultValue = "virtualrouter-1.8.tar.gz")
     public static String AGENT_PACKAGE_NAME;
     @GlobalProperty(name="VirtualRouter.agentPort", defaultValue = "7272")
     public static int AGENT_PORT;
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.zstack</groupId>
     <artifactId>zstack</artifactId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
     <packaging>pom</packaging>
     <name>zstack</name>
     <modules>
diff --git a/portal/pom.xml b/portal/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>portal</artifactId>
diff --git a/search/pom.xml b/search/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>search</artifactId>
diff --git a/simulator/pom.xml b/simulator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>zstack</artifactId>
         <groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>simulator</artifactId>
diff --git a/simulator/simulatorHeader/pom.xml b/simulator/simulatorHeader/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>simulator</artifactId>
 		<groupId>org.zstack</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>simulatorHeader</artifactId>
diff --git a/simulator/simulatorImpl/pom.xml b/simulator/simulatorImpl/pom.xml
diff --git a/storage/pom.xml b/storage/pom.xml
diff --git a/tag/pom.xml b/tag/pom.xml
diff --git a/test/pom.xml b/test/pom.xml
diff --git a/tool/doclet/pom.xml b/tool/doclet/pom.xml
diff --git a/tool/pom.xml b/tool/pom.xml
diff --git a/utils/pom.xml b/utils/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`*/`
`8`	`8`	`@GlobalPropertyDefinition`
`9`	`9`	`public class ConsoleGlobalProperty {`
`10`		`- @GlobalProperty(name="ConsoleProxy.agentPackageName", defaultValue = "consoleproxy-1.7.tar.gz")`
	`10`	`+ @GlobalProperty(name="ConsoleProxy.agentPackageName", defaultValue = "consoleproxy-1.8.tar.gz")`
`11`	`11`	`public static String AGENT_PACKAGE_NAME;`
`12`	`12`	`}`