Browse Source

Merge pull request #3222 from ewolinetz/fix_yamllint_logging

Resolving yamllint issues from logging playbooks
Scott Dodson 8 years ago
parent
commit
643d1d6091

+ 6 - 6
playbooks/adhoc/openshift_hosted_logging_efk.yaml

@@ -7,10 +7,10 @@
 - name: Update master-config for publicLoggingURL
   hosts: masters:!masters[0]
   pre_tasks:
-    - set_fact:
-        logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
+  - set_fact:
+      logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
   tasks:
-    - include_role:
-        name: openshift_hosted_logging
-        tasks_from: update_master_config
-      when: openshift_hosted_logging_deploy | default(false) | bool
+  - include_role:
+      name: openshift_hosted_logging
+      tasks_from: update_master_config
+    when: openshift_hosted_logging_deploy | default(false) | bool

+ 6 - 6
playbooks/common/openshift-cluster/openshift_hosted.yml

@@ -49,10 +49,10 @@
 - name: Update master-config for publicLoggingURL
   hosts: masters:!oo_first_master
   pre_tasks:
-    - set_fact:
-        logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
+  - set_fact:
+      logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
   tasks:
-    - include_role:
-        name: openshift_hosted_logging
-        tasks_from: update_master_config
-      when: openshift_hosted_logging_deploy | default(false) | boola
+  - include_role:
+      name: openshift_hosted_logging
+      tasks_from: update_master_config
+    when: openshift_hosted_logging_deploy | default(false) | boola

+ 4 - 4
playbooks/common/openshift-cluster/openshift_logging.yml

@@ -7,7 +7,7 @@
 - name: Update Master configs
   hosts: masters:!oo_first_master
   tasks:
-    - include_role:
-        name: openshift_logging
-        tasks_from: update_master_config
-      when: openshift_logging_install_logging | default(false) | bool
+  - include_role:
+      name: openshift_logging
+      tasks_from: update_master_config
+    when: openshift_logging_install_logging | default(false) | bool