summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-11 15:10:44 -0500
committerGitHub <noreply@github.com>2017-12-11 15:10:44 -0500
commit35cce25b61d6bbf4cec4574923838c14d328949b (patch)
tree7b2e80d31950b6bd833ba656b5d108f3b96c05df /roles
parentf894bcf6e7f1121cc024b2ff6a66db54740e02db (diff)
parent0e41e51763c54c650d43ca28c8595f0d58a163ae (diff)
downloadopenshift-35cce25b61d6bbf4cec4574923838c14d328949b.tar.gz
openshift-35cce25b61d6bbf4cec4574923838c14d328949b.tar.bz2
openshift-35cce25b61d6bbf4cec4574923838c14d328949b.tar.xz
openshift-35cce25b61d6bbf4cec4574923838c14d328949b.zip
Merge pull request #6402 from jmencak/cns-glusterfs_wipe
Check for openshift attribute before using it during CNS install.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
index 30e83e79b..0c2fcb2c5 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
@@ -23,7 +23,7 @@
state: absent
labels: "{{ glusterfs_nodeselector | oo_dict_to_list_of_dict }}"
with_items: "{{ groups.all }}"
- when: glusterfs_wipe
+ when: "'openshift' in hostvars[item] and glusterfs_wipe"
- name: Delete pre-existing GlusterFS config
file: