diff options
| author | Jose A. Rivera <jarrpa@redhat.com> | 2017-05-10 10:12:59 -0500 |
|---|---|---|
| committer | Jose A. Rivera <jarrpa@redhat.com> | 2017-06-13 13:10:23 -0500 |
| commit | 73d0a3857a5e623c6f2403ca0575bc28cd048d17 (patch) | |
| tree | 77d1902be0525216ca4a3e9830d44e0221470c2e | |
| parent | 75a46c184bda80158c085bcd38b40fd4d02aabd0 (diff) | |
| download | openshift-73d0a3857a5e623c6f2403ca0575bc28cd048d17.tar.gz openshift-73d0a3857a5e623c6f2403ca0575bc28cd048d17.tar.bz2 openshift-73d0a3857a5e623c6f2403ca0575bc28cd048d17.tar.xz openshift-73d0a3857a5e623c6f2403ca0575bc28cd048d17.zip | |
GlusterFS: Use groups variables
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
3 files changed, 7 insertions, 5 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml index 451990240..7244b6697 100644 --- a/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml +++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml @@ -17,6 +17,6 @@ glusterfs_heketi_topology_load: "{{ openshift_storage_glusterfs_heketi_topology_load }}" glusterfs_heketi_wipe: "{{ openshift_storage_glusterfs_heketi_wipe }}" glusterfs_heketi_url: "{{ openshift_storage_glusterfs_heketi_url }}" - glusterfs_nodes: "{{ g_glusterfs_hosts }}" + glusterfs_nodes: "{{ groups.glusterfs }}" - include: glusterfs_common.yml diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml index 392f4b65b..7fc312880 100644 --- a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml +++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml @@ -17,10 +17,12 @@ 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: "{{ g_glusterfs_registry_hosts }}" + glusterfs_nodes: "{{ groups.glusterfs_registry }}" - include: glusterfs_common.yml - when: g_glusterfs_registry_hosts != g_glusterfs_hosts + when: + - "'glusterfs_registry' in groups" + - "'glusterfs' not in groups or groups.glusterfs_registry != groups.glusterfs" - name: Delete pre-existing GlusterFS registry resources oc_obj: diff --git a/roles/openshift_storage_glusterfs/tasks/main.yml b/roles/openshift_storage_glusterfs/tasks/main.yml index ebd8db453..3efd995c0 100644 --- a/roles/openshift_storage_glusterfs/tasks/main.yml +++ b/roles/openshift_storage_glusterfs/tasks/main.yml @@ -7,11 +7,11 @@ - include: glusterfs_config.yml when: - - g_glusterfs_hosts | default([]) | count > 0 + - groups.glusterfs | default([]) | count > 0 - include: glusterfs_registry.yml when: - - g_glusterfs_registry_hosts | default([]) | count > 0 + - groups.glusterfs_registry | default([]) | count > 0 - "openshift.hosted.registry.storage.kind == 'glusterfs' or openshift.hosted.registry.glusterfs.swap" - name: Delete temp directory |