summaryrefslogtreecommitdiffstats
path: root/roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml
diff options
context:
space:
mode:
authorJose A. Rivera <jarrpa@redhat.com>2017-07-07 15:21:58 -0500
committerJose A. Rivera <jarrpa@redhat.com>2017-07-08 16:09:39 -0500
commit726dae9a3fa4b8e825387c39e2d5ef4a34095b7c (patch)
treedc4d387b39419cff57a0892c7503318fc257cfcb /roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml
parent2c647a966f141dff1aa1d716747e44b7d0923fd1 (diff)
downloadopenshift-726dae9a3fa4b8e825387c39e2d5ef4a34095b7c.tar.gz
openshift-726dae9a3fa4b8e825387c39e2d5ef4a34095b7c.tar.bz2
openshift-726dae9a3fa4b8e825387c39e2d5ef4a34095b7c.tar.xz
openshift-726dae9a3fa4b8e825387c39e2d5ef4a34095b7c.zip
GlusterFS: Fix SSH-based heketi configuration
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Diffstat (limited to 'roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml')
-rw-r--r--roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml11
1 files changed, 10 insertions, 1 deletions
diff --git a/roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml b/roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml
index 4434f750c..9ebb0d5ec 100644
--- a/roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml
+++ b/roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml
@@ -71,7 +71,7 @@ objects:
- name: HEKETI_ADMIN_KEY
value: ${HEKETI_ADMIN_KEY}
- name: HEKETI_EXECUTOR
- value: kubernetes
+ value: ${HEKETI_EXECUTOR}
- name: HEKETI_FSTAB
value: /var/lib/heketi/fstab
- name: HEKETI_SNAPSHOT_LIMIT
@@ -87,6 +87,8 @@ objects:
mountPath: /var/lib/heketi
- name: topology
mountPath: ${TOPOLOGY_PATH}
+ - name: config
+ mountPath: /etc/heketi
readinessProbe:
timeoutSeconds: 3
initialDelaySeconds: 3
@@ -104,6 +106,9 @@ objects:
- name: topology
secret:
secretName: heketi-${CLUSTER_NAME}-topology-secret
+ - name: config
+ secret:
+ secretName: heketi-${CLUSTER_NAME}-config-secret
parameters:
- name: HEKETI_USER_KEY
displayName: Heketi User Secret
@@ -111,6 +116,10 @@ parameters:
- name: HEKETI_ADMIN_KEY
displayName: Heketi Administrator Secret
description: Set secret for administration of the Heketi service as user _admin_
+- name: HEKETI_EXECUTOR
+ displayName: heketi executor type
+ description: Set the executor type, kubernetes or ssh
+ value: kubernetes
- name: HEKETI_KUBE_NAMESPACE
displayName: Namespace
description: Set the namespace where the GlusterFS pods reside