diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-02 15:59:05 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-02 15:59:05 -0400 |
| commit | 2b3943ce16ca421cf96008cfc7e5c86e9983a932 (patch) | |
| tree | ff6e4cc778af490f9a3ab9563298518b1e681c03 | |
| parent | 003fb8d42dffa9eb0ae43c70ec71a7b4efab11c7 (diff) | |
| parent | 4634017844fc330253ccb417086dd710feea0025 (diff) | |
| download | openshift-2b3943ce16ca421cf96008cfc7e5c86e9983a932.tar.gz openshift-2b3943ce16ca421cf96008cfc7e5c86e9983a932.tar.bz2 openshift-2b3943ce16ca421cf96008cfc7e5c86e9983a932.tar.xz openshift-2b3943ce16ca421cf96008cfc7e5c86e9983a932.zip | |
Merge pull request #1852 from sdodson/dns-improvements
Fix openshift_use_dnsmasq=False on 1.2/3.2 installs
| -rw-r--r-- | filter_plugins/openshift_node.py | 2 | ||||
| -rwxr-xr-x | roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/filter_plugins/openshift_node.py b/filter_plugins/openshift_node.py index 4ef92ba03..22670cf79 100644 --- a/filter_plugins/openshift_node.py +++ b/filter_plugins/openshift_node.py @@ -26,7 +26,7 @@ class FilterModule(object): if openshift_dns_ip != None: return openshift_dns_ip - if bool(hostvars['openshift']['common']['version_gte_3_2_or_1_2']): + if bool(hostvars['openshift']['common']['use_dnsmasq']): return hostvars['ansible_default_ipv4']['address'] elif bool(hostvars['openshift']['common']['version_gte_3_1_or_1_1']): if 'openshift_master_cluster_vip' in hostvars: diff --git a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh index 51e0751e9..691fa32f3 100755 --- a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh +++ b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh @@ -46,7 +46,6 @@ EOF for ns in ${DHCP4_DOMAIN_NAME_SERVERS}; do echo "server=${ns}" >> /etc/dnsmasq.d/origin-upstream-dns.conf done - echo "listen-address=${def_route_ip}" >> /etc/dnsmasq.d/origin-upstream-dns.conf systemctl restart dnsmasq sed -i 's/^nameserver.*$/nameserver '"${def_route_ip}"'/g' /etc/resolv.conf |