summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-08-13 12:47:08 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-08-13 12:47:08 -0400
commit1399425c70052445cc8659fd12cd19535fb95e5a (patch)
treeb8df165d1030862876cd36b1abd40298283fad47 /roles/openshift_master/templates
parentcd989f62709db9f858205420869b9a665cc609a1 (diff)
parentdcdb74b61cd49bee70da5997b9990da86cc3b1c8 (diff)
downloadopenshift-1399425c70052445cc8659fd12cd19535fb95e5a.tar.gz
openshift-1399425c70052445cc8659fd12cd19535fb95e5a.tar.bz2
openshift-1399425c70052445cc8659fd12cd19535fb95e5a.tar.xz
openshift-1399425c70052445cc8659fd12cd19535fb95e5a.zip
Merge pull request #450 from detiber/addDefaultNodeSelector
Add support for setting default node selector
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
1 files changed, 1 insertions, 1 deletions
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: