From: Sam Hague <shague@redhat.com>
Date: Mon, 21 Aug 2017 19:29:41 +0000 (+0000)
Subject: Merge "Add unique ID to vm hostnames"
X-Git-Tag: release/nitrogen~130
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=179a0cd0e9ef329842f8114588fd7928b533835f;hp=4dea8da9455f7431fc594826b4e859ee40ea4391;p=releng%2Fbuilder.git

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 eced29300..fd1b96a30 100644
--- 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 09adfdb79..0196284e0 100644
--- 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 79de0db5a..5352d9ab1 100644
--- 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 39c38563c..8242aa646 100644
--- 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