summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-31 09:30:41 -0400
committerGitHub <noreply@github.com>2017-07-31 09:30:41 -0400
commitae0da816c639c3740613e5b6f44b02d1ca96f405 (patch)
tree61b1b5c5fd8851a4639f35385c6cb5875b82052e
parent17f700a35653f549528507f3ce587be95311d61f (diff)
parentbf7bd5fb73a260a829dbd68690258c72481b3e94 (diff)
downloadopenshift-ae0da816c639c3740613e5b6f44b02d1ca96f405.tar.gz
openshift-ae0da816c639c3740613e5b6f44b02d1ca96f405.tar.bz2
openshift-ae0da816c639c3740613e5b6f44b02d1ca96f405.tar.xz
openshift-ae0da816c639c3740613e5b6f44b02d1ca96f405.zip
Merge pull request #4952 from jarrpa/namespace_fix
GlusterFS: Fix variable names in defaults.
-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 8661f33a1..2823a7610 100644
--- a/roles/openshift_storage_glusterfs/defaults/main.yml
+++ b/roles/openshift_storage_glusterfs/defaults/main.yml
@@ -1,6 +1,5 @@
---
openshift_storage_glusterfs_timeout: 300
-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"
@@ -25,6 +24,7 @@ openshift_storage_glusterfs_heketi_ssh_port: 22
openshift_storage_glusterfs_heketi_ssh_user: 'root'
openshift_storage_glusterfs_heketi_ssh_sudo: False
openshift_storage_glusterfs_heketi_ssh_keyfile: '/dev/null'
+openshift_storage_glusterfs_namespace: "{{ 'glusterfs' | quote if openshift_storage_glusterfs_is_native or openshift_storage_glusterfs_heketi_is_native else 'default' | quote }}"
openshift_storage_glusterfs_registry_timeout: "{{ openshift_storage_glusterfs_timeout }}"
openshift_storage_glusterfs_registry_namespace: "{{ openshift.hosted.registry.namespace | default(openshift_storage_glusterfs_namespace) }}"