summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-28 09:10:58 -0400
committerGitHub <noreply@github.com>2017-07-28 09:10:58 -0400
commit8bf8f395ac0d83b7aa97b8388639ae590bf78e6f (patch)
tree8fcc19ff2e178c855b3249ee40199aa34a07b80b
parentf0abc3268bcc0f33cd6539d870c6231d4028082d (diff)
parent2e8005d1fc1424d90ab88a924e45546791e483b1 (diff)
downloadopenshift-8bf8f395ac0d83b7aa97b8388639ae590bf78e6f.tar.gz
openshift-8bf8f395ac0d83b7aa97b8388639ae590bf78e6f.tar.bz2
openshift-8bf8f395ac0d83b7aa97b8388639ae590bf78e6f.tar.xz
openshift-8bf8f395ac0d83b7aa97b8388639ae590bf78e6f.zip
Merge pull request #4926 from jarrpa/glusterfs-mixed-namespace
GlusterFS: Use default namespace when not native.
-rw-r--r--roles/openshift_storage_glusterfs/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_storage_glusterfs/defaults/main.yml b/roles/openshift_storage_glusterfs/defaults/main.yml
index a846889ca..8661f33a1 100644
--- a/roles/openshift_storage_glusterfs/defaults/main.yml
+++ b/roles/openshift_storage_glusterfs/defaults/main.yml
@@ -1,6 +1,6 @@
---
openshift_storage_glusterfs_timeout: 300
-openshift_storage_glusterfs_namespace: 'glusterfs'
+openshift_storage_glusterfs_namespace: "{{ 'glusterfs' | quote if glusterfs_is_native or glusterfs_heketi_is_native else 'default' | quote }}"
openshift_storage_glusterfs_is_native: True
openshift_storage_glusterfs_name: 'storage'
openshift_storage_glusterfs_nodeselector: "glusterfs={{ openshift_storage_glusterfs_name }}-host"