summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-08-12 09:33:02 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-08-12 21:33:26 -0400
commitdcdb74b61cd49bee70da5997b9990da86cc3b1c8 (patch)
treebda65a1980d356145d6f5cc828fbb4742997e2c9 /roles/openshift_master
parentd307f715764164c8f543d57486718f95b1987875 (diff)
downloadopenshift-dcdb74b61cd49bee70da5997b9990da86cc3b1c8.tar.gz
openshift-dcdb74b61cd49bee70da5997b9990da86cc3b1c8.tar.bz2
openshift-dcdb74b61cd49bee70da5997b9990da86cc3b1c8.tar.xz
openshift-dcdb74b61cd49bee70da5997b9990da86cc3b1c8.zip
Add support for setting default node selector
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml1
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 151d0662f..f90f526c9 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -55,6 +55,7 @@
sdn_host_subnet_length: "{{ osm_host_subnet_length | default(None) }}"
default_subdomain: "{{ osm_default_subdomain | default(None) }}"
custom_cors_origins: "{{ osm_custom_cors_origins | default(None) }}"
+ default_node_selector: "{{ osm_default_node_selector | default(None) }}"
# TODO: These values need to be configurable
- name: Set dns OpenShift facts
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index c4d319c87..b5e3d2f05 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -95,7 +95,7 @@ policyConfig:
openshiftSharedResourcesNamespace: openshift
{# TODO: Allow users to override projectConfig items #}
projectConfig:
- defaultNodeSelector: ""
+ defaultNodeSelector: "{{ openshift.master.default_node_selector | default("") }}"
projectRequestMessage: ""
projectRequestTemplate: ""
securityAllocator: