summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-10 17:26:28 -0500
committerGitHub <noreply@github.com>2017-02-10 17:26:28 -0500
commit312831c4c70fb424ca914a5c798350cc4ec7e4a9 (patch)
treebb371cac9106aadf020b7706310e6e60a6288bfe /playbooks/common/openshift-cluster
parentbda3bf8cbc75d1dd9a1c4add106af3feb0563b24 (diff)
parent69afd8e8ff5c278cf3907ef6c7e7e1ced6247447 (diff)
downloadopenshift-312831c4c70fb424ca914a5c798350cc4ec7e4a9.tar.gz
openshift-312831c4c70fb424ca914a5c798350cc4ec7e4a9.tar.bz2
openshift-312831c4c70fb424ca914a5c798350cc4ec7e4a9.tar.xz
openshift-312831c4c70fb424ca914a5c798350cc4ec7e4a9.zip
Merge pull request #3311 from enoodle/logging_ops_nfs_and_pv_provisioning
Provisioning of nfs share and PV for logging ops
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index 40bd8ccd0..06cda36a5 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -39,9 +39,9 @@
openshift_hosted_logging_elasticsearch_pvc_size: "{{ openshift.hosted.logging.storage.volume.size if openshift_hosted_logging_storage_kind | default(none) in ['dynamic','nfs'] else '' }}"
openshift_hosted_logging_elasticsearch_pvc_prefix: "{{ 'logging-es' if openshift_hosted_logging_storage_kind | default(none) == 'dynamic' else '' }}"
openshift_hosted_logging_elasticsearch_ops_cluster_size: "{{ logging_elasticsearch_ops_cluster_size }}"
- openshift_hosted_logging_elasticsearch_ops_pvc_dynamic: "{{ 'true' if openshift_hosted_logging_storage_kind | default(none) == 'dynamic' else '' }}"
+ openshift_hosted_logging_elasticsearch_ops_pvc_dynamic: "{{ 'true' if openshift_hosted_loggingops_storage_kind | default(none) == 'dynamic' else '' }}"
openshift_hosted_logging_elasticsearch_ops_pvc_size: "{{ openshift.hosted.logging.storage.volume.size if openshift_hosted_logging_storage_kind | default(none) in ['dynamic','nfs' ] else '' }}"
- openshift_hosted_logging_elasticsearch_ops_pvc_prefix: "{{ 'logging-es-ops' if openshift_hosted_logging_storage_kind | default(none) =='dynamic' else '' }}"
+ openshift_hosted_logging_elasticsearch_ops_pvc_prefix: "{{ 'logging-es-ops' if openshift_hosted_loggingops_storage_kind | default(none) =='dynamic' else '' }}"
- role: cockpit-ui
when: ( openshift.common.version_gte_3_3_or_1_3 | bool ) and ( openshift_hosted_manage_registry | default(true) | bool ) and not (openshift.docker.hosted_registry_insecure | default(false) | bool)