summaryrefslogtreecommitdiffstats
path: root/roles/openshift_storage_glusterfs/templates/v3.6/glusterfs-storageclass.yml.j2
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-19 13:19:40 -0400
committerGitHub <noreply@github.com>2017-06-19 13:19:40 -0400
commit326d8e530db5f0cfcbc1a77451150699063e900e (patch)
treecf25b17eb27b7cab361e84c02b3eb4445521e374 /roles/openshift_storage_glusterfs/templates/v3.6/glusterfs-storageclass.yml.j2
parentf6de39e8f38d77565481bc9709ec0be5d9d4c6ab (diff)
parentb1c40b3dbbc7cfbf9ed0f6f657a68b4ea6a53136 (diff)
downloadopenshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.gz
openshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.bz2
openshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.xz
openshift-326d8e530db5f0cfcbc1a77451150699063e900e.zip
Merge pull request #4484 from jarrpa/glusterfs-fixes-too
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_storage_glusterfs/templates/v3.6/glusterfs-storageclass.yml.j2')
-rw-r--r--roles/openshift_storage_glusterfs/templates/v3.6/glusterfs-storageclass.yml.j25
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_storage_glusterfs/templates/v3.6/glusterfs-storageclass.yml.j2 b/roles/openshift_storage_glusterfs/templates/v3.6/glusterfs-storageclass.yml.j2
index 9b8fae310..5ea801e60 100644
--- a/roles/openshift_storage_glusterfs/templates/v3.6/glusterfs-storageclass.yml.j2
+++ b/roles/openshift_storage_glusterfs/templates/v3.6/glusterfs-storageclass.yml.j2
@@ -5,6 +5,7 @@ metadata:
name: glusterfs-{{ glusterfs_name }}
provisioner: kubernetes.io/glusterfs
parameters:
- resturl: "http://{{ glusterfs_heketi_url }}:8081"
+ resturl: "http://{% if glusterfs_heketi_is_native %}{{ glusterfs_heketi_route }}{% else %}{{ glusterfs_heketi_url }}:{{ glusterfs_heketi_port }}{% endif %}"
+ restuser: "admin"
secretNamespace: "{{ glusterfs_namespace }}"
- secretName: "heketi-{{ glusterfs_name }}-user-secret"
+ secretName: "heketi-{{ glusterfs_name }}-secret"