diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-12 11:53:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 11:53:43 -0800 |
| commit | 31b0dff6385c48ebd3b3c306a2b53e9d9b63b744 (patch) | |
| tree | 2d4487b72a7b1b7234359a04d8a9aad84e546414 /roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml | |
| parent | 79a487da0a4eeb10776ad312debacf603189ef04 (diff) | |
| parent | 27c60fa67aa0c62e48165a40c78223e264070e9a (diff) | |
| download | openshift-31b0dff6385c48ebd3b3c306a2b53e9d9b63b744.tar.gz openshift-31b0dff6385c48ebd3b3c306a2b53e9d9b63b744.tar.bz2 openshift-31b0dff6385c48ebd3b3c306a2b53e9d9b63b744.tar.xz openshift-31b0dff6385c48ebd3b3c306a2b53e9d9b63b744.zip | |
Merge pull request #7083 from SaravanaStorageNetwork/fix_templates
Automatic merge from submit-queue.
Backport changes for glusterfs and heketi template
Backport changes for glusterfs and heketi template
To avoid unknown parameter errors like GB_GLFS_LRU_COUNT and
HEKETI_FSTAB
Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
Diffstat (limited to 'roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml')
| -rw-r--r-- | roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml b/roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml index 61b6a8c13..28cdb2982 100644 --- a/roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml +++ b/roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml @@ -15,6 +15,7 @@ objects: name: heketi-${CLUSTER_NAME} labels: glusterfs: heketi-${CLUSTER_NAME}-service + heketi: ${CLUSTER_NAME}-service annotations: description: Exposes Heketi service spec: @@ -30,6 +31,7 @@ objects: name: ${HEKETI_ROUTE} labels: glusterfs: heketi-${CLUSTER_NAME}-route + heketi: ${CLUSTER_NAME}-route spec: to: kind: Service @@ -40,6 +42,7 @@ objects: name: heketi-${CLUSTER_NAME} labels: glusterfs: heketi-${CLUSTER_NAME}-dc + heketi: ${CLUSTER_NAME}-dc annotations: description: Defines how to deploy Heketi spec: @@ -55,6 +58,7 @@ objects: name: heketi-${CLUSTER_NAME} labels: glusterfs: heketi-${CLUSTER_NAME}-pod + heketi: ${CLUSTER_NAME}-pod spec: serviceAccountName: heketi-${CLUSTER_NAME}-service-account containers: @@ -69,13 +73,11 @@ objects: - name: HEKETI_EXECUTOR value: ${HEKETI_EXECUTOR} - name: HEKETI_FSTAB - value: /var/lib/heketi/fstab + value: ${HEKETI_FSTAB} - name: HEKETI_SNAPSHOT_LIMIT value: '14' - name: HEKETI_KUBE_GLUSTER_DAEMONSET value: '1' - - name: HEKETI_KUBE_NAMESPACE - value: ${HEKETI_KUBE_NAMESPACE} ports: - containerPort: 8080 volumeMounts: @@ -114,10 +116,10 @@ parameters: 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 - value: default +- name: HEKETI_FSTAB + displayName: heketi fstab path + description: Set the fstab path, file that is populated with bricks that heketi creates + value: /var/lib/heketi/fstab - name: HEKETI_ROUTE displayName: heketi route name description: Set the hostname for the route URL |