diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-30 15:25:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 15:25:53 -0500 |
| commit | 643d1d60919e3f2a258744e0c0b7b3a9105f9828 (patch) | |
| tree | 54c4e99d98800bd507f2a4d044c844ecfee58eea | |
| parent | 3372da1e38a73a3f005e6263e7ccdb5aa858106a (diff) | |
| parent | fc6fc0c5c789fffc42d6848b8983342abeafff00 (diff) | |
| download | openshift-643d1d60919e3f2a258744e0c0b7b3a9105f9828.tar.gz openshift-643d1d60919e3f2a258744e0c0b7b3a9105f9828.tar.bz2 openshift-643d1d60919e3f2a258744e0c0b7b3a9105f9828.tar.xz openshift-643d1d60919e3f2a258744e0c0b7b3a9105f9828.zip | |
Merge pull request #3222 from ewolinetz/fix_yamllint_logging
Resolving yamllint issues from logging playbooks
| -rw-r--r-- | playbooks/adhoc/openshift_hosted_logging_efk.yaml | 12 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 12 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_logging.yml | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/playbooks/adhoc/openshift_hosted_logging_efk.yaml b/playbooks/adhoc/openshift_hosted_logging_efk.yaml index c08231dda..0b30a221d 100644 --- a/playbooks/adhoc/openshift_hosted_logging_efk.yaml +++ b/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 diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index a5b26c7de..021d19dad 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/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 diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml index 580d1e5a7..82f18f5e1 100644 --- a/playbooks/common/openshift-cluster/openshift_logging.yml +++ b/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 |