YAML Linting

* Added checks to make ci for yaml linting
* Modified y(a)ml files to pass lint checks

4 files changed, 28 insertions, 26 deletions

diff --git a/playbooks/openstack/openshift-cluster/cluster_hosts.yml b/playbooks/openstack/openshift-cluster/cluster_hosts.yml
index 12c436eaf..98434439c 100644
--- a/playbooks/openstack/openshift-cluster/cluster_hosts.yml
+++ b/playbooks/openstack/openshift-cluster/cluster_hosts.yml
@@ -1,21 +1,21 @@
 ---
-g_all_hosts:     "{{ groups['meta-clusterid_' ~ cluster_id] | default([])
-                    | intersect(groups['meta-environment_' ~ cluster_env] | default([])) }}"
+g_all_hosts: "{{ groups['meta-clusterid_' ~ cluster_id] | default([])
+                 | intersect(groups['meta-environment_' ~ cluster_env] | default([])) }}"
 
-g_etcd_hosts:    "{{ g_all_hosts | intersect(groups['meta-host-type_etcd'] | default([])) }}"
+g_etcd_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_etcd'] | default([])) }}"
 
-g_lb_hosts:      "{{ g_all_hosts | intersect(groups['meta-host-type_lb'] | default([])) }}"
+g_lb_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_lb'] | default([])) }}"
 
-g_nfs_hosts:     "{{ g_all_hosts | intersect(groups['meta-host-type_nfs'] | default([])) }}"
+g_nfs_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_nfs'] | default([])) }}"
 
-g_master_hosts:  "{{ g_all_hosts | intersect(groups['meta-host-type_master'] | default([])) }}"
+g_master_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_master'] | default([])) }}"
 
 g_new_master_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_new_master'] | default([])) }}"
 
-g_node_hosts:    "{{ g_all_hosts | intersect(groups['meta-host-type_node'] | default([])) }}"
+g_node_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_node'] | default([])) }}"
 
 g_new_node_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_new_node'] | default([])) }}"
 
-g_infra_hosts:   "{{ g_node_hosts | intersect(groups['meta-sub-host-type_infra'] | default([])) }}"
+g_infra_hosts: "{{ g_node_hosts | intersect(groups['meta-sub-host-type_infra'] | default([])) }}"
 
 g_compute_hosts: "{{ g_node_hosts | intersect(groups['meta-sub-host-type_compute'] | default([])) }}"
diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml
index f460b14c8..c0bc12f55 100644
--- a/playbooks/openstack/openshift-cluster/launch.yml
+++ b/playbooks/openstack/openshift-cluster/launch.yml
@@ -111,9 +111,9 @@
         public_v4: '{{ item[2] }}'
         private_v4: '{{ item[1] }}'
     with_together:
-      - '{{ parsed_outputs.etcd_names }}'
-      - '{{ parsed_outputs.etcd_ips }}'
-      - '{{ parsed_outputs.etcd_floating_ips }}'
+    - '{{ parsed_outputs.etcd_names }}'
+    - '{{ parsed_outputs.etcd_ips }}'
+    - '{{ parsed_outputs.etcd_floating_ips }}'
 
   - name: Add new master instances groups and variables
     add_host:
@@ -128,9 +128,9 @@
         public_v4: '{{ item[2] }}'
         private_v4: '{{ item[1] }}'
     with_together:
-      - '{{ parsed_outputs.master_names }}'
-      - '{{ parsed_outputs.master_ips }}'
-      - '{{ parsed_outputs.master_floating_ips }}'
+    - '{{ parsed_outputs.master_names }}'
+    - '{{ parsed_outputs.master_ips }}'
+    - '{{ parsed_outputs.master_floating_ips }}'
 
   - name: Add new node instances groups and variables
     add_host:
@@ -145,9 +145,9 @@
         public_v4: '{{ item[2] }}'
         private_v4: '{{ item[1] }}'
     with_together:
-      - '{{ parsed_outputs.node_names }}'
-      - '{{ parsed_outputs.node_ips }}'
-      - '{{ parsed_outputs.node_floating_ips }}'
+    - '{{ parsed_outputs.node_names }}'
+    - '{{ parsed_outputs.node_ips }}'
+    - '{{ parsed_outputs.node_floating_ips }}'
 
   - name: Add new infra instances groups and variables
     add_host:
@@ -162,18 +162,18 @@
         public_v4: '{{ item[2] }}'
         private_v4: '{{ item[1] }}'
     with_together:
-      - '{{ parsed_outputs.infra_names }}'
-      - '{{ parsed_outputs.infra_ips }}'
-      - '{{ parsed_outputs.infra_floating_ips }}'
+    - '{{ parsed_outputs.infra_names }}'
+    - '{{ parsed_outputs.infra_ips }}'
+    - '{{ parsed_outputs.infra_floating_ips }}'
 
   - name: Wait for ssh
     wait_for:
       host: '{{ item }}'
       port: 22
     with_flattened:
-      - '{{ parsed_outputs.master_floating_ips }}'
-      - '{{ parsed_outputs.node_floating_ips }}'
-      - '{{ parsed_outputs.infra_floating_ips }}'
+    - '{{ parsed_outputs.master_floating_ips }}'
+    - '{{ parsed_outputs.node_floating_ips }}'
+    - '{{ parsed_outputs.infra_floating_ips }}'
 
   - name: Wait for user setup
     command: 'ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ deployment_vars[deployment_type].ssh_user }}@{{ item }} echo {{ deployment_vars[deployment_type].ssh_user }} user is setup'
@@ -182,9 +182,9 @@
     retries: 30
     delay: 1
     with_flattened:
-      - '{{ parsed_outputs.master_floating_ips }}'
-      - '{{ parsed_outputs.node_floating_ips }}'
-      - '{{ parsed_outputs.infra_floating_ips }}'
+    - '{{ parsed_outputs.master_floating_ips }}'
+    - '{{ parsed_outputs.node_floating_ips }}'
+    - '{{ parsed_outputs.infra_floating_ips }}'
 
 - include: update.yml
 
diff --git a/playbooks/openstack/openshift-cluster/terminate.yml b/playbooks/openstack/openshift-cluster/terminate.yml
index 4527f4a28..affb57117 100644
--- a/playbooks/openstack/openshift-cluster/terminate.yml
+++ b/playbooks/openstack/openshift-cluster/terminate.yml
@@ -1,3 +1,4 @@
+---
 - name: Terminate instance(s)
   hosts: localhost
   become: no
diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml
index 79b336ce7..ba2855b73 100644
--- a/playbooks/openstack/openshift-cluster/vars.yml
+++ b/playbooks/openstack/openshift-cluster/vars.yml
@@ -1,3 +1,4 @@
+# yamllint disable rule:colons
 ---
 debug_level: 2
 openstack_infra_heat_stack:     "{{ lookup('oo_option', 'infra_heat_stack' ) |