diff options
author | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
---|---|---|
committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
commit | 055921cd545c12733949f37c1af2c0a1296216ec (patch) | |
tree | 0ad645b9a75eacbb168c9fdc92d585867b5317a4 /roles/openshift_master/tasks | |
parent | 10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (diff) | |
parent | 922b87ede66f6b7e376d1f46e13327077cd41719 (diff) | |
download | openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.gz openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.bz2 openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.xz openshift-055921cd545c12733949f37c1af2c0a1296216ec.zip |
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 151d0662f..9204d25ce 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -55,13 +55,16 @@ 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) }}" + api_server_args: "{{ osm_api_server_args | default(None) }}" + controller_args: "{{ osm_controller_args | default(None) }}" # TODO: These values need to be configurable - name: Set dns OpenShift facts openshift_facts: role: dns local_facts: - ip: "{{ openshift.common.ip }}" + ip: "{{ openshift_master_cluster_vip | default(openshift.common.ip, true) | default(None) }}" domain: cluster.local when: openshift.master.embedded_dns |