diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-02-02 16:29:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 16:29:57 -0600 |
| commit | 44efb12df99f0cc5647b2a76064d049226cd57ea (patch) | |
| tree | 7ccddcf20de5f0b46a64e98bfc9980c90b03d613 /playbooks | |
| parent | 3cb6ca6fcddbc0117b943f70576481a65b23358a (diff) | |
| parent | 51c7796b32c9fc0df30ea463ba238422158e7bad (diff) | |
| download | openshift-44efb12df99f0cc5647b2a76064d049226cd57ea.tar.gz openshift-44efb12df99f0cc5647b2a76064d049226cd57ea.tar.bz2 openshift-44efb12df99f0cc5647b2a76064d049226cd57ea.tar.xz openshift-44efb12df99f0cc5647b2a76064d049226cd57ea.zip | |
Merge pull request #3239 from ewolinetz/logging_fix_immutable_spec_changes
Adding bool filter to when openshift_logging_use_ops evals and updati…
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_logging.yml | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 143bc37a2..3c4a99887 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -54,6 +54,7 @@ - set_fact: logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}" tasks: + - block: - include_role: name: openshift_hosted_logging diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml index 82f18f5e1..d96a78c4c 100644 --- a/playbooks/common/openshift-cluster/openshift_logging.yml +++ b/playbooks/common/openshift-cluster/openshift_logging.yml @@ -7,7 +7,8 @@ - name: Update Master configs hosts: masters:!oo_first_master tasks: - - include_role: - name: openshift_logging - tasks_from: update_master_config + - block: + - include_role: + name: openshift_logging + tasks_from: update_master_config when: openshift_logging_install_logging | default(false) | bool |