summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-10 14:09:58 -0500
committerGitHub <noreply@github.com>2017-02-10 14:09:58 -0500
commit0826250be3d0fe2b6ae7e68dcc975d9937a4100a (patch)
treec810d6cbda32770f6e41a3306260db0b62a265c5 /playbooks/common/openshift-cluster
parent09c94b86530242970a830199861b56b3d622ee48 (diff)
parent8d103f6bdea2a02d6e4769e4868dd398ecf2a60f (diff)
downloadopenshift-0826250be3d0fe2b6ae7e68dcc975d9937a4100a.tar.gz
openshift-0826250be3d0fe2b6ae7e68dcc975d9937a4100a.tar.bz2
openshift-0826250be3d0fe2b6ae7e68dcc975d9937a4100a.tar.xz
openshift-0826250be3d0fe2b6ae7e68dcc975d9937a4100a.zip
Merge pull request #3330 from jcantrill/bz_1399523_default_ops_prefix
bug 1399523. Ops pvc should have different prefix from non-ops for op…
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index ca4f5b8b2..40bd8ccd0 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -41,7 +41,7 @@
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_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' if openshift_hosted_logging_storage_kind | default(none) =='dynamic' else '' }}"
+ openshift_hosted_logging_elasticsearch_ops_pvc_prefix: "{{ 'logging-es-ops' if openshift_hosted_logging_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)