diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-28 17:03:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 17:03:35 -0500 |
| commit | bc77099615299390638a69adcf96c0a67c5e5275 (patch) | |
| tree | ff1997a11c2ef0107778fb34f97ff5a2182a7ec9 /roles/openshift_master | |
| parent | 8755f3279980fb9d3dc9166c197975f243893c72 (diff) | |
| parent | 602310de78f785c9715f97075c67e176a2c62932 (diff) | |
| download | openshift-bc77099615299390638a69adcf96c0a67c5e5275.tar.gz openshift-bc77099615299390638a69adcf96c0a67c5e5275.tar.bz2 openshift-bc77099615299390638a69adcf96c0a67c5e5275.tar.xz openshift-bc77099615299390638a69adcf96c0a67c5e5275.zip | |
Merge pull request #6299 from mgugino-upstream-stage/dns-facts
Remove dns_port fact
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index e9a51e55b..1fe7086bc 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -15,6 +15,8 @@ system_images_registry: "{{ system_images_registry_dict[openshift_deployment_typ l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}" +openshift_master_dns_port: 8053 + openshift_node_ips: [] r_openshift_master_clean_install: false r_openshift_master_etcd3_storage: false @@ -26,9 +28,9 @@ default_r_openshift_master_os_firewall_allow: - service: api controllers https port: "{{ openshift.master.controllers_port }}/tcp" - service: skydns tcp - port: "{{ openshift.master.dns_port }}/tcp" + port: "{{ openshift_master_dns_port }}/tcp" - service: skydns udp - port: "{{ openshift.master.dns_port }}/udp" + port: "{{ openshift_master_dns_port }}/udp" - service: etcd embedded port: 4001/tcp cond: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}" diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 629fe3286..d5dd9e9c0 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -65,7 +65,7 @@ disabledFeatures: {{ openshift.master.disabled_features | to_json }} {% endif %} {% if openshift.master.embedded_dns | bool %} dnsConfig: - bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.dns_port }} + bindAddress: {{ openshift.master.bind_addr }}:{{ openshift_master_dns_port }} bindNetwork: tcp4 {% endif %} etcdClientInfo: |