Merge pull request #2964 from mtnbikenc/linting-refactor

YAML Linting with CI checking

4 files changed, 67 insertions, 67 deletions

diff --git a/playbooks/aws/openshift-cluster/cluster_hosts.yml b/playbooks/aws/openshift-cluster/cluster_hosts.yml
index 119b376aa..fbaf81dec 100644
--- a/playbooks/aws/openshift-cluster/cluster_hosts.yml
+++ b/playbooks/aws/openshift-cluster/cluster_hosts.yml
@@ -1,21 +1,21 @@
 ---
-g_all_hosts:     "{{ groups['tag_clusterid_' ~ cluster_id] | default([])
-                    | intersect(groups['tag_environment_' ~ cluster_env] | default([])) }}"
+g_all_hosts: "{{ groups['tag_clusterid_' ~ cluster_id] | default([])
+                 | intersect(groups['tag_environment_' ~ cluster_env] | default([])) }}"
 
-g_etcd_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type_etcd'] | default([])) }}"
+g_etcd_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_etcd'] | default([])) }}"
 
-g_lb_hosts:      "{{ g_all_hosts | intersect(groups['tag_host-type_lb'] | default([])) }}"
+g_lb_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_lb'] | default([])) }}"
 
-g_nfs_hosts:     "{{ g_all_hosts | intersect(groups['tag_host-type_nfs'] | default([])) }}"
+g_nfs_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_nfs'] | default([])) }}"
 
-g_master_hosts:  "{{ g_all_hosts | intersect(groups['tag_host-type_master'] | default([])) }}"
+g_master_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_master'] | default([])) }}"
 
 g_new_master_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_new_master'] | default([])) }}"
 
-g_node_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type_node'] | default([])) }}"
+g_node_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_node'] | default([])) }}"
 
 g_new_node_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_new_node'] | default([])) }}"
 
-g_infra_hosts:   "{{ g_node_hosts | intersect(groups['tag_sub-host-type_infra'] | default([])) }}"
+g_infra_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type_infra'] | default([])) }}"
 
 g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type_compute'] | default([])) }}"
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml
index 49e028396..d60b68885 100644
--- a/playbooks/aws/openshift-cluster/config.yml
+++ b/playbooks/aws/openshift-cluster/config.yml
@@ -17,8 +17,8 @@
 
 - include: ../../common/openshift-cluster/config.yml
   vars:
-    g_ssh_user:     "{{ deployment_vars[deployment_type].ssh_user }}"
-    g_sudo:         "{{ deployment_vars[deployment_type].become }}"
+    g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
+    g_sudo: "{{ deployment_vars[deployment_type].become }}"
     g_nodeonmaster: true
     openshift_cluster_id: "{{ cluster_id }}"
     openshift_debug_level: "{{ debug_level }}"
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index 4d76d3bfe..608512b79 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -125,21 +125,21 @@
 
 - set_fact:
     logrotate:
-        - name: syslog
-          path: |
-            /var/log/cron
-            /var/log/maillog
-            /var/log/messages
-            /var/log/secure
-            /var/log/spooler"
-          options:
-            - daily
-            - rotate 7
-            - compress
-            - sharedscripts
-            - missingok
-          scripts:
-            postrotate: "/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true"
+    - name: syslog
+      path: |
+        /var/log/cron
+        /var/log/maillog
+        /var/log/messages
+        /var/log/secure
+        /var/log/spooler"
+      options:
+      - daily
+      - rotate 7
+      - compress
+      - sharedscripts
+      - missingok
+      scripts:
+        postrotate: "/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true"
 
 - name: Add new instances groups and variables
   add_host:
diff --git a/playbooks/aws/openshift-cluster/terminate.yml b/playbooks/aws/openshift-cluster/terminate.yml
index 7a8375d0e..1f15aa4bf 100644
--- a/playbooks/aws/openshift-cluster/terminate.yml
+++ b/playbooks/aws/openshift-cluster/terminate.yml
@@ -29,49 +29,49 @@
   become: no
   gather_facts: no
   tasks:
-    - name: Remove tags from instances
-      ec2_tag:
-        resource: "{{ hostvars[item]['ec2_id'] }}"
-        region: "{{ hostvars[item]['ec2_region'] }}"
-        state: absent
-        tags:
-          environment:   "{{ hostvars[item]['ec2_tag_environment'] }}"
-          clusterid:     "{{ hostvars[item]['ec2_tag_clusterid'] }}"
-          host-type:     "{{ hostvars[item]['ec2_tag_host-type'] }}"
-          sub_host_type: "{{ hostvars[item]['ec2_tag_sub-host-type'] }}"
-      with_items: "{{ groups.oo_hosts_to_terminate }}"
-      when: "'oo_hosts_to_terminate' in groups"
+  - name: Remove tags from instances
+    ec2_tag:
+      resource: "{{ hostvars[item]['ec2_id'] }}"
+      region: "{{ hostvars[item]['ec2_region'] }}"
+      state: absent
+      tags:
+        environment: "{{ hostvars[item]['ec2_tag_environment'] }}"
+        clusterid: "{{ hostvars[item]['ec2_tag_clusterid'] }}"
+        host-type: "{{ hostvars[item]['ec2_tag_host-type'] }}"
+        sub_host_type: "{{ hostvars[item]['ec2_tag_sub-host-type'] }}"
+    with_items: "{{ groups.oo_hosts_to_terminate }}"
+    when: "'oo_hosts_to_terminate' in groups"
 
-    - name: Terminate instances
-      ec2:
-        state: absent
-        instance_ids: ["{{ hostvars[item].ec2_id }}"]
-        region: "{{ hostvars[item].ec2_region }}"
-      ignore_errors: yes
-      register: ec2_term
-      with_items: "{{ groups.oo_hosts_to_terminate }}"
-      when: "'oo_hosts_to_terminate' in groups"
+  - name: Terminate instances
+    ec2:
+      state: absent
+      instance_ids: ["{{ hostvars[item].ec2_id }}"]
+      region: "{{ hostvars[item].ec2_region }}"
+    ignore_errors: yes
+    register: ec2_term
+    with_items: "{{ groups.oo_hosts_to_terminate }}"
+    when: "'oo_hosts_to_terminate' in groups"
 
-    # Fail if any of the instances failed to terminate with an error other
-    # than 403 Forbidden
-    - fail:
-        msg: "Terminating instance {{ item.ec2_id }} failed with message {{ item.msg }}"
-      when: "'oo_hosts_to_terminate' in groups and item.has_key('failed') and item.failed"
-      with_items: "{{ ec2_term.results }}"
+  # Fail if any of the instances failed to terminate with an error other
+  # than 403 Forbidden
+  - fail:
+      msg: "Terminating instance {{ item.ec2_id }} failed with message {{ item.msg }}"
+    when: "'oo_hosts_to_terminate' in groups and item.has_key('failed') and item.failed"
+    with_items: "{{ ec2_term.results }}"
 
-    - name: Stop instance if termination failed
-      ec2:
-        state: stopped
-        instance_ids: ["{{ item.item.ec2_id }}"]
-        region: "{{ item.item.ec2_region }}"
-      register: ec2_stop
-      when: "'oo_hosts_to_terminate' in groups and item.has_key('failed') and item.failed"
-      with_items: "{{ ec2_term.results }}"
+  - name: Stop instance if termination failed
+    ec2:
+      state: stopped
+      instance_ids: ["{{ item.item.ec2_id }}"]
+      region: "{{ item.item.ec2_region }}"
+    register: ec2_stop
+    when: "'oo_hosts_to_terminate' in groups and item.has_key('failed') and item.failed"
+    with_items: "{{ ec2_term.results }}"
 
-    - name: Rename stopped instances
-      ec2_tag: resource={{ item.item.item.ec2_id }} region={{ item.item.item.ec2_region }} state=present
-      args:
-        tags:
-          Name: "{{ item.item.item.ec2_tag_Name }}-terminate"
-      with_items: "{{ ec2_stop.results }}"
-      when: ec2_stop | changed
+  - name: Rename stopped instances
+    ec2_tag: resource={{ item.item.item.ec2_id }} region={{ item.item.item.ec2_region }} state=present
+    args:
+      tags:
+        Name: "{{ item.item.item.ec2_tag_Name }}-terminate"
+    with_items: "{{ ec2_stop.results }}"
+    when: ec2_stop | changed