diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-19 13:19:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 13:19:40 -0400 |
| commit | 326d8e530db5f0cfcbc1a77451150699063e900e (patch) | |
| tree | cf25b17eb27b7cab361e84c02b3eb4445521e374 /roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml | |
| parent | f6de39e8f38d77565481bc9709ec0be5d9d4c6ab (diff) | |
| parent | b1c40b3dbbc7cfbf9ed0f6f657a68b4ea6a53136 (diff) | |
| download | openshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.gz openshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.bz2 openshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.xz openshift-326d8e530db5f0cfcbc1a77451150699063e900e.zip | |
Merge pull request #4484 from jarrpa/glusterfs-fixes-too
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml')
| -rw-r--r-- | roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml index 4c6891eeb..0849f2a2e 100644 --- a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml +++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml @@ -19,12 +19,13 @@ glusterfs_heketi_topology_load: "{{ openshift_storage_glusterfs_registry_heketi_topology_load }}" glusterfs_heketi_wipe: "{{ openshift_storage_glusterfs_registry_heketi_wipe }}" glusterfs_heketi_url: "{{ openshift_storage_glusterfs_registry_heketi_url }}" - glusterfs_nodes: "{{ groups.glusterfs_registry }}" + glusterfs_heketi_port: "{{ openshift_storage_glusterfs_registry_heketi_port }}" + glusterfs_nodes: "{{ groups.glusterfs_registry | default(groups.glusterfs) }}" - include: glusterfs_common.yml when: - - groups.glusterfs_registry | default([]) | count > 0 - - "'glusterfs' not in groups or groups.glusterfs_registry != groups.glusterfs" + - glusterfs_nodes | default([]) | count > 0 + - "'glusterfs' not in groups or glusterfs_nodes != groups.glusterfs" - name: Delete pre-existing GlusterFS registry resources oc_obj: |