summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJose A. Rivera <jarrpa@redhat.com>2017-07-31 08:24:26 -0500
committerJose A. Rivera <jarrpa@redhat.com>2017-07-31 08:26:37 -0500
commitbf7bd5fb73a260a829dbd68690258c72481b3e94 (patch)
tree70c020c35a6732baf90ed5481b93a5015a02ea3b /roles
parent3be2748d87f7eda17ed8cec496bbbd11b311b076 (diff)
downloadopenshift-bf7bd5fb73a260a829dbd68690258c72481b3e94.tar.gz
openshift-bf7bd5fb73a260a829dbd68690258c72481b3e94.tar.bz2
openshift-bf7bd5fb73a260a829dbd68690258c72481b3e94.tar.xz
openshift-bf7bd5fb73a260a829dbd68690258c72481b3e94.zip
GlusterFS: Fix variable names in defaults.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1476197 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Diffstat (limited to 'roles')
-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) }}"