Fix yamllint openstack-hot jjb

Change-Id: If701416e01cf727bd1a87244733936d2598aa864
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 6319d5c1e5b6f72c7f9334375c3aaa6051784523..7ee461873ddb6ac74239699caf29f5898a65d2de 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -1,7 +1,6 @@
 ---
 # TODO: Make all bash constants more readable.
 # e.g.: DISTRIBUTION_BRANCH instead of DISTROBRANCH.
-
 - parameter:
     name: integration-distribution-branch
     parameters:

diff --git a/openstack-hot/csit-2-instance-type.yaml b/openstack-hot/csit-2-instance-type.yaml
index a70be2101b221e951fd7a5270e6010d56c87bd1e..eced293009697175f063f5f706e3bfcf1d43b192 100644 (file)
--- a/openstack-hot/csit-2-instance-type.yaml
+++ b/openstack-hot/csit-2-instance-type.yaml
@@ -1,3 +1,4 @@
+---
 heat_template_version: 2016-04-08
 
 parameters:
@@ -32,35 +33,35 @@ resources:
     vm_0_group:
         type: "OS::Heat::ResourceGroup"
         properties:
-            count: { get_param: vm_0_count }
+            count: {get_param: vm_0_count}
             resource_def:
                 type: generic-server.yaml
                 properties:
-                    job_name: { get_param: job_name }
-                    silo: { get_param: silo }
-                    ssh_key: { get_param: silo }
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
                     index: "%index%"
-                    vm_flavor: { get_param: vm_0_flavor }
-                    vm_image: { get_param: vm_0_image }
+                    vm_flavor: {get_param: vm_0_flavor}
+                    vm_image: {get_param: vm_0_image}
 
     vm_1_group:
         type: "OS::Heat::ResourceGroup"
         properties:
-            count: { get_param: vm_1_count }
+            count: {get_param: vm_1_count}
             resource_def:
                 type: generic-server.yaml
                 properties:
-                    job_name: { get_param: job_name }
-                    silo: { get_param: silo }
-                    ssh_key: { get_param: silo }
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
                     index: "%index%"
-                    vm_flavor: { get_param: vm_1_flavor }
-                    vm_image: { get_param: vm_1_image }
+                    vm_flavor: {get_param: vm_1_flavor}
+                    vm_image: {get_param: vm_1_image}
 
 outputs:
     vm_0_ips:
         description: IP addresses of the 1st vm types
-        value: { get_attr: [vm_0_group, ip] }
+        value: {get_attr: [vm_0_group, ip]}
     vm_1_ips:
         description: IP addresses of the 2nd vm types
-        value: { get_attr: [vm_1_group, ip] }
+        value: {get_attr: [vm_1_group, ip]}

diff --git a/openstack-hot/csit-3-instance-type.yaml b/openstack-hot/csit-3-instance-type.yaml
index 3aadcf9f79e9b8491c7e31bd85b4ec8ac121bdef..09adfdb793816b4b7b5ac37b92df8c71f9a57705 100644 (file)
--- a/openstack-hot/csit-3-instance-type.yaml
+++ b/openstack-hot/csit-3-instance-type.yaml
@@ -1,3 +1,4 @@
+---
 heat_template_version: 2016-04-08
 
 parameters:
@@ -41,52 +42,52 @@ resources:
     vm_0_group:
         type: "OS::Heat::ResourceGroup"
         properties:
-            count: { get_param: vm_0_count }
+            count: {get_param: vm_0_count}
             resource_def:
                 type: generic-server.yaml
                 properties:
-                    job_name: { get_param: job_name }
-                    silo: { get_param: silo }
-                    ssh_key: { get_param: silo }
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
                     index: "%index%"
-                    vm_flavor: { get_param: vm_0_flavor }
-                    vm_image: { get_param: vm_0_image }
+                    vm_flavor: {get_param: vm_0_flavor}
+                    vm_image: {get_param: vm_0_image}
 
     vm_1_group:
         type: "OS::Heat::ResourceGroup"
         properties:
-            count: { get_param: vm_1_count }
+            count: {get_param: vm_1_count}
             resource_def:
                 type: generic-server.yaml
                 properties:
-                    job_name: { get_param: job_name }
-                    silo: { get_param: silo }
-                    ssh_key: { get_param: silo }
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
                     index: "%index%"
-                    vm_flavor: { get_param: vm_1_flavor }
-                    vm_image: { get_param: vm_1_image }
+                    vm_flavor: {get_param: vm_1_flavor}
+                    vm_image: {get_param: vm_1_image}
 
     vm_2_group:
         type: "OS::Heat::ResourceGroup"
         properties:
-            count: { get_param: vm_2_count }
+            count: {get_param: vm_2_count}
             resource_def:
                 type: generic-server.yaml
                 properties:
-                    job_name: { get_param: job_name }
-                    silo: { get_param: silo }
-                    ssh_key: { get_param: silo }
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
                     index: "%index%"
-                    vm_flavor: { get_param: vm_2_flavor }
-                    vm_image: { get_param: vm_2_image }
+                    vm_flavor: {get_param: vm_2_flavor}
+                    vm_image: {get_param: vm_2_image}
 
 outputs:
     vm_0_ips:
         description: IP addresses of the 1st vm types
-        value: { get_attr: [vm_0_group, ip] }
+        value: {get_attr: [vm_0_group, ip]}
     vm_1_ips:
         description: IP addresses of the 2nd vm types
-        value: { get_attr: [vm_1_group, ip] }
+        value: {get_attr: [vm_1_group, ip]}
     vm_2_ips:
         description: IP addresses of the 3rd vm types
-        value: { get_attr: [vm_2_group, ip] }
+        value: {get_attr: [vm_2_group, ip]}

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index 947be4c7291dcee962ce8be1e32244bb501e19a3..39c38563c7edb4464970c36e7b9693e4aced993b 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -1,3 +1,4 @@
+---
 heat_template_version: 2016-04-08
 
 parameters:
@@ -32,30 +33,33 @@ resources:
     instance:
         type: "OS::Nova::Server"
         properties:
-            flavor: { get_param: vm_flavor }
-            image: { get_param: vm_image }
+            flavor: {get_param: vm_flavor}
+            image: {get_param: vm_image}
             name:
                 str_replace:
                     template: SILO-JOB_NAME-VM_TYPE-INDEX
                     params:
-                        "SILO": { get_param: silo }
-                        "JOB_NAME": { get_param: job_name }
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
                         "VM_TYPE":
                             str_split:
                                 - ' - '
-                                - { get_param: vm_image }
+                                - {get_param: vm_image}
                                 - 1
-                        "INDEX": { get_param: index }
+                        "INDEX": {get_param: index}
             networks:
                 - network: RC-ODL
-            key_name: { get_param: ssh_key }
+            key_name: {get_param: ssh_key}
             user_data: |
                 #!/bin/bash
-                until ping -c1 git.opendaylight.org &>/dev/null; do echo "Waiting until git.opendaylight.org is resolvable..."; done
+                until ping -c1 git.opendaylight.org &>/dev/null
+                do
+                    echo "Waiting until git.opendaylight.org is resolvable..."
+                done
                 git clone https://git.opendaylight.org/gerrit/releng/builder /builder
                 /builder/jenkins-scripts/jenkins-init-script.sh
 
 outputs:
     ip:
         description: IP address of the instance
-        value: { get_attr: [instance, networks, RC-ODL, 0] }
+        value: {get_attr: [instance, networks, RC-ODL, 0]}