summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-08 21:01:17 -0800
committerGitHub <noreply@github.com>2018-02-08 21:01:17 -0800
commit4fb27adfd2f9006c90f99aa1ecd7487ca13008a7 (patch)
treebc2e2da3120eac623833dd7a8bcf31695aa8dee4 /roles
parent7add856d112f60f06495906a2b1aebc6ef99b623 (diff)
parentbc712160ddd27d0531a66da4f930d26b5506aa34 (diff)
downloadopenshift-4fb27adfd2f9006c90f99aa1ecd7487ca13008a7.tar.gz
openshift-4fb27adfd2f9006c90f99aa1ecd7487ca13008a7.tar.bz2
openshift-4fb27adfd2f9006c90f99aa1ecd7487ca13008a7.tar.xz
openshift-4fb27adfd2f9006c90f99aa1ecd7487ca13008a7.zip
Merge pull request #7072 from jarrpa/gluster-block-route
Automatic merge from submit-queue. GlusterFS: Fix block StorageClass heketi route Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542861
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml19
1 files changed, 19 insertions, 0 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
index e6e261b52..4928e86e5 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
@@ -330,6 +330,25 @@
- 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"