Merge pull request #4909 from jarrpa/glusterfs_name-fix

GlusterFS: Default glusterfs_name in loop items.

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
 

roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml

@@ -13,7 +13,7 @@
   - kind: template
     name: glusterfs
   - kind: daemonset
-    name: "glusterfs-{{ glusterfs_name }}"
+    name: "glusterfs-{{ glusterfs_name | default }}"
   when: glusterfs_wipe
 
 - name: Unlabel any existing GlusterFS nodes

roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml

@@ -41,7 +41,7 @@
     state: absent
   with_items:
   - kind: "svc"
-    name: "glusterfs-{{ glusterfs_name }}-endpoints"
+    name: "glusterfs-{{ glusterfs_name | default }}-endpoints"
   failed_when: False
 
 - name: Generate GlusterFS registry endpoints

roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml

@@ -51,7 +51,7 @@
   - kind: "svc"
     name: "heketi-storage-endpoints"
   - kind: "secret"
-    name: "heketi-{{ glusterfs_name }}-topology-secret"
+    name: "heketi-{{ glusterfs_name | default }}-topology-secret"
 
 - name: Generate heketi endpoints
   template: