summaryrefslogtreecommitdiffstats
path: root/roles/openshift_storage_glusterfs/files
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-25 09:42:49 -0700
committerGitHub <noreply@github.com>2017-09-25 09:42:49 -0700
commit33ac861412ab745b0cd36cc42735b92953737661 (patch)
tree17c49e2824cd39061161ba27df04fa999971360e /roles/openshift_storage_glusterfs/files
parent67ff061a940a4b9dce6686b8a00a3eb52aeeb698 (diff)
parent62977f65b6aefb17a9a0ffd7e468cbe806251e71 (diff)
downloadopenshift-33ac861412ab745b0cd36cc42735b92953737661.tar.gz
openshift-33ac861412ab745b0cd36cc42735b92953737661.tar.bz2
openshift-33ac861412ab745b0cd36cc42735b92953737661.tar.xz
openshift-33ac861412ab745b0cd36cc42735b92953737661.zip
Merge pull request #5415 from ttindell2/master
Automatic merge from submit-queue #5362 GlusterFS fails to run more than once #5362 Added the ability to have the GlusterFS ansible script run more than once. It also allows to update the topology of the Gluster cluster even if the Gluster cluster has already been deployed. @dustymabe
Diffstat (limited to 'roles/openshift_storage_glusterfs/files')
-rw-r--r--roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml8
1 files changed, 0 insertions, 8 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 9ebb0d5ec..7b705c2d4 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
@@ -85,8 +85,6 @@ objects:
volumeMounts:
- name: db
mountPath: /var/lib/heketi
- - name: topology
- mountPath: ${TOPOLOGY_PATH}
- name: config
mountPath: /etc/heketi
readinessProbe:
@@ -103,9 +101,6 @@ objects:
port: 8080
volumes:
- name: db
- - name: topology
- secret:
- secretName: heketi-${CLUSTER_NAME}-topology-secret
- name: config
secret:
secretName: heketi-${CLUSTER_NAME}-config-secret
@@ -138,6 +133,3 @@ parameters:
displayName: GlusterFS cluster name
description: A unique name to identify this heketi service, useful for running multiple heketi instances
value: glusterfs
-- name: TOPOLOGY_PATH
- displayName: heketi topology file location
- required: True