summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose A. Rivera <jarrpa@redhat.com>2017-05-12 11:02:51 -0500
committerJose A. Rivera <jarrpa@redhat.com>2017-06-13 13:10:23 -0500
commit378a80feea73cd1964e2e49a43380cc733e281a0 (patch)
treeb85401e2a6d70c2b97ab69d8e52ab82ca6320922
parentfb96b04bdb1b21562bec5a17dda753f93a4a7877 (diff)
downloadopenshift-378a80feea73cd1964e2e49a43380cc733e281a0.tar.gz
openshift-378a80feea73cd1964e2e49a43380cc733e281a0.tar.bz2
openshift-378a80feea73cd1964e2e49a43380cc733e281a0.tar.xz
openshift-378a80feea73cd1964e2e49a43380cc733e281a0.zip
GlusterFS: Allow for configuration of node selector
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
-rw-r--r--roles/openshift_storage_glusterfs/files/v3.6/glusterfs-template.yml7
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml1
2 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_storage_glusterfs/files/v3.6/glusterfs-template.yml b/roles/openshift_storage_glusterfs/files/v3.6/glusterfs-template.yml
index c66705752..ab4ca3d37 100644
--- a/roles/openshift_storage_glusterfs/files/v3.6/glusterfs-template.yml
+++ b/roles/openshift_storage_glusterfs/files/v3.6/glusterfs-template.yml
@@ -28,8 +28,7 @@ objects:
labels:
glusterfs-node: pod
spec:
- nodeSelector:
- storagenode: glusterfs
+ nodeSelector: "${{NODE_LABELS}}"
hostNetwork: true
containers:
- name: glusterfs
@@ -120,6 +119,10 @@ objects:
dnsPolicy: ClusterFirst
securityContext: {}
parameters:
+- name: NODE_LABELS
+ displayName: Daemonset Node Labels
+ description: Labels which define the daemonset node selector.
+ value: '{ "storagenode": "glusterfs" }'
- name: IMAGE_NAME
displayName: GlusterFS container name
required: True
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
index 1b3814b0b..bd7987e30 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml
@@ -89,6 +89,7 @@
params:
IMAGE_NAME: "{{ glusterfs_image }}"
IMAGE_VERSION: "{{ glusterfs_version }}"
+ NODE_LABELS: "{{ glusterfs_nodeselector }}"
- name: Wait for GlusterFS pods
oc_obj: