1 files changed, 49 insertions, 1 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
index 001578406..4928e86e5 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
@@ -313,7 +313,55 @@
   - glusterfs_storageclass or glusterfs_s3_deploy
 
 - include_tasks: glusterblock_deploy.yml
-  when: glusterfs_block_deploy
+  when:
+  - glusterfs_block_deploy
+  #TODO: Remove this when multipathd will be available on atomic
+  - not openshift_is_atomic | bool
+
+- block:
+  - name: Create heketi block secret
+    oc_secret:
+      namespace: "{{ glusterfs_namespace }}"
+      state: present
+      name: "heketi-{{ glusterfs_name }}-admin-secret-block"
+      type: "gluster.org/glusterblock"
+      force: True
+      contents:
+      - path: key
+        data: "{{ glusterfs_heketi_admin_key }}"
+    when: glusterfs_heketi_admin_key is defined
+
+  - name: Get heketi route
+    oc_obj:
+      namespace: "{{ glusterfs_namespace }}"
+      kind: route
+      state: list
+      name: "heketi-{{ glusterfs_name }}"
+    register: heketi_route
+    when:
+    - glusterfs_heketi_is_native
+    - glusterfs_heketi_route is not defined
+
+  - name: Determine StorageClass heketi URL
+    set_fact:
+      glusterfs_heketi_route: "{{ heketi_route.results.results[0]['spec']['host'] }}"
+    when:
+    - glusterfs_heketi_is_native
+    - glusterfs_heketi_route is not defined
+
+  - name: Generate Gluster Block StorageClass file
+    template:
+      src: "{{ openshift.common.examples_content_version }}/gluster-block-storageclass.yml.j2"
+      dest: "{{ mktemp.stdout }}/gluster-block-storageclass.yml"
+
+  - name: Create Gluster Block StorageClass
+    oc_obj:
+      state: present
+      kind: storageclass
+      name: "glusterfs-{{ glusterfs_name }}-block"
+      files:
+      - "{{ mktemp.stdout }}/gluster-block-storageclass.yml"
+  when: glusterfs_block_storageclass
 
 - include_tasks: gluster_s3_deploy.yml
   when: glusterfs_s3_deploy