diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 10:07:27 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 10:07:27 -0400 |
| commit | 3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341 (patch) | |
| tree | 36eaafd964e7a96f7f0d4272d3cc77d29272a52c /roles/openshift_master | |
| parent | 1f490c2374038669df3d2bfcb01af54361f8907e (diff) | |
| parent | bc11db0c73554be36b4196993d39a35cecbbd25b (diff) | |
| download | openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.gz openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.bz2 openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.xz openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.zip | |
Merge pull request #1588 from sdodson/cluster-dns
Cluster dns provided by dnsmasq
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 6bf28ff2b..09bde6002 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -9,10 +9,10 @@ os_firewall_allow: port: "{{ openshift.master.api_port }}/tcp" - service: api controllers https port: "{{ openshift.master.controllers_port }}/tcp" -- service: dns tcp - port: 53/tcp -- service: dns udp - port: 53/udp +- service: skydns tcp + port: "{{ openshift.master.dns_port }}/tcp" +- service: skydns udp + port: "{{ openshift.master.dns_port }}/udp" - service: Fluentd td-agent tcp port: 24224/tcp - service: Fluentd td-agent udp diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 1009aa318..979b428bf 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -123,7 +123,7 @@ kubernetesMasterConfig: keyFile: master.proxy-client.key schedulerConfigFile: {{ openshift_master_scheduler_conf }} servicesNodePortRange: "" - servicesSubnet: {{ openshift.master.portal_net }} + servicesSubnet: {{ openshift.common.portal_net }} staticNodeNames: {{ openshift_node_ips | default([], true) }} {% endif %} masterClients: @@ -138,7 +138,7 @@ networkConfig: networkPluginName: {{ openshift.common.sdn_network_plugin_name }} {% endif %} # serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet - serviceNetworkCIDR: {{ openshift.master.portal_net }} + serviceNetworkCIDR: {{ openshift.common.portal_net }} oauthConfig: {% if 'oauth_always_show_provider_selection' in openshift.master %} alwaysShowProviderSelection: {{ openshift.master.oauth_always_show_provider_selection }} |