Merge "Add unique ID to vm hostnames"

diff --git a/openstack-hot/csit-2-instance-type.yaml b/openstack-hot/csit-2-instance-type.yaml
index eced293009697175f063f5f706e3bfcf1d43b192..fd1b96a308ec375013a6f63e814d9ad901a9a265 100644 (file)
--- a/openstack-hot/csit-2-instance-type.yaml
+++ b/openstack-hot/csit-2-instance-type.yaml
@@ -41,6 +41,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "0"
                     vm_flavor: {get_param: vm_0_flavor}
                     vm_image: {get_param: vm_0_image}
 
@@ -55,6 +56,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "1"
                     vm_flavor: {get_param: vm_1_flavor}
                     vm_image: {get_param: vm_1_image}
 

diff --git a/openstack-hot/csit-3-instance-type.yaml b/openstack-hot/csit-3-instance-type.yaml
index 09adfdb793816b4b7b5ac37b92df8c71f9a57705..0196284e0d356e65ae73c01d492ff9c3e556066a 100644 (file)
--- a/openstack-hot/csit-3-instance-type.yaml
+++ b/openstack-hot/csit-3-instance-type.yaml
@@ -50,6 +50,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "0"
                     vm_flavor: {get_param: vm_0_flavor}
                     vm_image: {get_param: vm_0_image}
 
@@ -64,6 +65,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "1"
                     vm_flavor: {get_param: vm_1_flavor}
                     vm_image: {get_param: vm_1_image}
 
@@ -78,6 +80,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "2"
                     vm_flavor: {get_param: vm_2_flavor}
                     vm_image: {get_param: vm_2_image}
 

diff --git a/openstack-hot/csit-4-instance-type.yaml b/openstack-hot/csit-4-instance-type.yaml
index 79de0db5afe712b8b25cf1ee8db61bc46f0d03e2..5352d9ab1d7ed137f518b6a8648e3519c0539307 100644 (file)
--- a/openstack-hot/csit-4-instance-type.yaml
+++ b/openstack-hot/csit-4-instance-type.yaml
@@ -59,6 +59,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "0"
                     vm_flavor: {get_param: vm_0_flavor}
                     vm_image: {get_param: vm_0_image}
 
@@ -73,6 +74,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "1"
                     vm_flavor: {get_param: vm_1_flavor}
                     vm_image: {get_param: vm_1_image}
 
@@ -87,6 +89,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "2"
                     vm_flavor: {get_param: vm_2_flavor}
                     vm_image: {get_param: vm_2_image}
     vm_3_group:
@@ -100,6 +103,7 @@ resources:
                     silo: {get_param: silo}
                     ssh_key: {get_param: silo}
                     index: "%index%"
+                    group: "3"
                     vm_flavor: {get_param: vm_3_flavor}
                     vm_image: {get_param: vm_3_image}
 

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index 39c38563c7edb4464970c36e7b9693e4aced993b..8242aa6464b56c765b29e4d16464d4b37311b594 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -21,6 +21,9 @@ parameters:
         description: SSH Key name to use (Public key must exist in OpenStack)
     index:
         type: number
+    group:
+        type: number
+        default: "0"
     vm_flavor:
         type: string
         default: 1 GB General Purpose v1
@@ -37,7 +40,7 @@ resources:
             image: {get_param: vm_image}
             name:
                 str_replace:
-                    template: SILO-JOB_NAME-VM_TYPE-INDEX
+                    template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
                     params:
                         "SILO": {get_param: silo}
                         "JOB_NAME": {get_param: job_name}
@@ -46,6 +49,7 @@ resources:
                                 - ' - '
                                 - {get_param: vm_image}
                                 - 1
+                        "GROUP": {get_param: group}
                         "INDEX": {get_param: index}
             networks:
                 - network: RC-ODL