diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-14 12:00:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-14 12:00:28 -0400 |
commit | f7d8bd196c4cd7fed7de94a9ab87abd3295b5b06 (patch) | |
tree | 52bc9476d98c5e441bf73a510c831cff256f4bf6 /roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml | |
parent | 256e6586a1bc1cfd134c2290251ff9288df3dcd4 (diff) | |
parent | 97e1bc9436a757b2ffd802de531073f4b1b95c48 (diff) | |
download | openshift-f7d8bd196c4cd7fed7de94a9ab87abd3295b5b06.tar.gz openshift-f7d8bd196c4cd7fed7de94a9ab87abd3295b5b06.tar.bz2 openshift-f7d8bd196c4cd7fed7de94a9ab87abd3295b5b06.tar.xz openshift-f7d8bd196c4cd7fed7de94a9ab87abd3295b5b06.zip |
Merge pull request #4245 from jarrpa/glusterfs-fixes
Merged by openshift-bot
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 | 41 |
1 files changed, 24 insertions, 17 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 df045c170..1d8f1abdf 100644 --- a/roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml +++ b/roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml @@ -8,15 +8,13 @@ metadata: annotations: description: Heketi service deployment template tags: glusterfs,heketi -labels: - template: heketi objects: - kind: Service apiVersion: v1 metadata: - name: heketi + name: heketi-${CLUSTER_NAME} labels: - glusterfs: heketi-service + glusterfs: heketi-${CLUSTER_NAME}-service annotations: description: Exposes Heketi service spec: @@ -25,40 +23,40 @@ objects: port: 8080 targetPort: 8080 selector: - glusterfs: heketi-pod + glusterfs: heketi-${CLUSTER_NAME}-pod - kind: Route apiVersion: v1 metadata: - name: heketi + name: heketi-${CLUSTER_NAME} labels: - glusterfs: heketi-route + glusterfs: heketi-${CLUSTER_NAME}-route spec: to: kind: Service - name: heketi + name: heketi-${CLUSTER_NAME} - kind: DeploymentConfig apiVersion: v1 metadata: - name: heketi + name: heketi-${CLUSTER_NAME} labels: - glusterfs: heketi-dc + glusterfs: heketi-${CLUSTER_NAME}-dc annotations: description: Defines how to deploy Heketi spec: replicas: 1 selector: - glusterfs: heketi-pod + glusterfs: heketi-${CLUSTER_NAME}-pod triggers: - type: ConfigChange strategy: type: Recreate template: metadata: - name: heketi + name: heketi-${CLUSTER_NAME} labels: - glusterfs: heketi-pod + glusterfs: heketi-${CLUSTER_NAME}-pod spec: - serviceAccountName: heketi-service-account + serviceAccountName: heketi-${CLUSTER_NAME}-service-account containers: - name: heketi image: ${IMAGE_NAME}:${IMAGE_VERSION} @@ -76,6 +74,8 @@ objects: value: '14' - name: HEKETI_KUBE_GLUSTER_DAEMONSET value: '1' + - name: HEKETI_KUBE_NAMESPACE + value: ${HEKETI_KUBE_NAMESPACE} ports: - containerPort: 8080 volumeMounts: @@ -96,7 +96,7 @@ objects: volumes: - name: db glusterfs: - endpoints: heketi-storage-endpoints + endpoints: heketi-db-${CLUSTER_NAME}-endpoints path: heketidbstorage parameters: - name: HEKETI_USER_KEY @@ -105,9 +105,16 @@ parameters: - name: HEKETI_ADMIN_KEY displayName: Heketi Administrator Secret description: Set secret for administration of the Heketi service as user _admin_ +- name: HEKETI_KUBE_NAMESPACE + displayName: Namespace + description: Set the namespace where the GlusterFS pods reside + value: default - name: IMAGE_NAME - displayName: GlusterFS container name + displayName: heketi container name required: True - name: IMAGE_VERSION - displayName: GlusterFS container versiona + displayName: heketi container versiona required: True +- name: CLUSTER_NAME + displayName: GlusterFS cluster name + value: glusterfs |