diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-02-08 16:43:14 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-02-08 16:43:14 -0600 |
| commit | 10b809ffa7edad6e21744c92fe744fc45073694a (patch) | |
| tree | 39091a84f22674c45ed85d17b6a5c67274673fcc /playbooks | |
| parent | 8977765b44da953dd23942ef3335aebab5142d95 (diff) | |
| download | openshift-10b809ffa7edad6e21744c92fe744fc45073694a.tar.gz openshift-10b809ffa7edad6e21744c92fe744fc45073694a.tar.bz2 openshift-10b809ffa7edad6e21744c92fe744fc45073694a.tar.xz openshift-10b809ffa7edad6e21744c92fe744fc45073694a.zip | |
Updating defaults to pull from previously defined variable names used in playbooks
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/adhoc/openshift_hosted_logging_efk.yaml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/playbooks/adhoc/openshift_hosted_logging_efk.yaml b/playbooks/adhoc/openshift_hosted_logging_efk.yaml index 0b30a221d..44a2ef534 100644 --- a/playbooks/adhoc/openshift_hosted_logging_efk.yaml +++ b/playbooks/adhoc/openshift_hosted_logging_efk.yaml @@ -1,16 +1,16 @@ --- - hosts: masters[0] roles: - - role: openshift_hosted_logging + - role: openshift_logging openshift_hosted_logging_cleanup: no - 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))) }}" + openshift_logging_kibana_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 + name: openshift_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 3c4a99887..ca4f5b8b2 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -27,9 +27,9 @@ logging_elasticsearch_ops_cluster_size: "{{ openshift_hosted_logging_elasticsearch_ops_cluster_size | default(1) }}" roles: - role: openshift_hosted - - role: openshift_hosted_metrics + - role: openshift_metrics when: openshift_hosted_metrics_deploy | default(false) | bool - - role: openshift_hosted_logging + - role: openshift_logging when: openshift_hosted_logging_deploy | default(false) | bool openshift_hosted_logging_hostname: "{{ logging_hostname }}" openshift_hosted_logging_ops_hostname: "{{ logging_ops_hostname }}" @@ -52,11 +52,11 @@ - hosted pre_tasks: - set_fact: - logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}" + openshift_logging_kibana_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 + name: openshift_logging tasks_from: update_master_config when: openshift_hosted_logging_deploy | default(false) | bool |