Bläddra i källkod

Merge pull request #450 from detiber/addDefaultNodeSelector

Add support for setting default node selector
Thomas Wiest 9 år sedan
förälder
incheckning
1399425c70

+ 3 - 0
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

+ 1 - 0
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

+ 1 - 1
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: