diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-08-13 12:47:08 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-08-13 12:47:08 -0400 |
| commit | 1399425c70052445cc8659fd12cd19535fb95e5a (patch) | |
| tree | b8df165d1030862876cd36b1abd40298283fad47 | |
| parent | cd989f62709db9f858205420869b9a665cc609a1 (diff) | |
| parent | dcdb74b61cd49bee70da5997b9990da86cc3b1c8 (diff) | |
| download | openshift-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
| -rw-r--r-- | inventory/byo/hosts.example | 3 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 629956d0e..dd5c02b77 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -60,6 +60,9 @@ deployment_type=enterprise # additional cors origins #osm_custom_cors_origins=['foo.example.com', 'bar.example.com'] +# default project node selector +#osm_default_node_selector='region=primary' + # host group for masters [masters] ose3-master[1:3]-ansible.test.example.com 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: |