Browse Source

GlusterFS: Allow configuration of kube namespace for heketi

Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Jose A. Rivera 8 years ago
parent
commit
efc6b81fa4

+ 6 - 0
roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml

@@ -81,6 +81,8 @@ objects:
             value: '14'
           - name: HEKETI_KUBE_GLUSTER_DAEMONSET
             value: '1'
+          - name: HEKETI_KUBE_NAMESPACE
+            value: ${HEKETI_KUBE_NAMESPACE}
           ports:
           - containerPort: 8080
           volumeMounts:
@@ -107,6 +109,10 @@ 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
   required: True

+ 6 - 0
roles/openshift_storage_glusterfs/files/v3.6/heketi-template.yml

@@ -76,6 +76,8 @@ objects:
             value: '14'
           - name: HEKETI_KUBE_GLUSTER_DAEMONSET
             value: '1'
+          - name: HEKETI_KUBE_NAMESPACE
+            value: ${HEKETI_KUBE_NAMESPACE}
           ports:
           - containerPort: 8080
           volumeMounts:
@@ -105,6 +107,10 @@ 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
   required: True

+ 1 - 0
roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml

@@ -25,6 +25,7 @@
       IMAGE_VERSION: "{{ glusterfs_heketi_version }}"
       HEKETI_USER_KEY: "{{ glusterfs_heketi_user_key }}"
       HEKETI_ADMIN_KEY: "{{ glusterfs_heketi_admin_key }}"
+      HEKETI_KUBE_NAMESPACE: "{{ glusterfs_namespace }}"
 
 - name: Wait for deploy-heketi pod
   oc_obj:

+ 1 - 0
roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml

@@ -71,6 +71,7 @@
       IMAGE_VERSION: "{{ glusterfs_heketi_version }}"
       HEKETI_USER_KEY: "{{ glusterfs_heketi_user_key }}"
       HEKETI_ADMIN_KEY: "{{ glusterfs_heketi_admin_key }}"
+      HEKETI_KUBE_NAMESPACE: "{{ glusterfs_namespace }}"
 
 - name: Wait for heketi pod
   oc_obj: