diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-08-07 13:54:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-07 13:54:25 -0400 |
commit | ef423c0675d83d3b60132953fa5576c056a5a30c (patch) | |
tree | ec5764200de0c34e5ba8f20244e40684111f94be /roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml | |
parent | 05d13781c789b3afb35bbd29b0bbfb591c1cc0ce (diff) | |
parent | 5e838f556d9cbf57c65bcd0cb4507b8791c7c1a8 (diff) | |
download | openshift-ef423c0675d83d3b60132953fa5576c056a5a30c.tar.gz openshift-ef423c0675d83d3b60132953fa5576c056a5a30c.tar.bz2 openshift-ef423c0675d83d3b60132953fa5576c056a5a30c.tar.xz openshift-ef423c0675d83d3b60132953fa5576c056a5a30c.zip |
Merge pull request #4909 from jarrpa/glusterfs_name-fix
GlusterFS: Default glusterfs_name in loop items.
Diffstat (limited to 'roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml')
-rw-r--r-- | roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml index 981688ac3..a31c5bd5e 100644 --- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml +++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml @@ -30,17 +30,17 @@ - kind: "svc" name: "heketi-storage-endpoints" - kind: "secret" - name: "heketi-{{ glusterfs_name }}-topology-secret" + name: "heketi-{{ glusterfs_name | default }}-topology-secret" - kind: "secret" - name: "heketi-{{ glusterfs_name }}-config-secret" + name: "heketi-{{ glusterfs_name | default }}-config-secret" - kind: "template,route,service,dc" - name: "heketi-{{ glusterfs_name }}" + name: "heketi-{{ glusterfs_name | default }}" - kind: "svc" - name: "heketi-db-{{ glusterfs_name }}-endpoints" + name: "heketi-db-{{ glusterfs_name | default }}-endpoints" - kind: "sa" - name: "heketi-{{ glusterfs_name }}-service-account" + name: "heketi-{{ glusterfs_name | default }}-service-account" - kind: "secret" - name: "heketi-{{ glusterfs_name }}-admin-secret" + name: "heketi-{{ glusterfs_name | default }}-admin-secret" failed_when: False when: glusterfs_heketi_wipe |