Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Add dns1 and dns2 for nm-controlled resolv.conf

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2017-08-21 21:01:08 +00:00
parent d12cedc5d3
commit dae3290dd7
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/all
View file

@ -267,4 +267,7 @@ nagios_Check_Services:
baseiptables: True
# Most of our machines have manual resolv.conf files
# These settings are for machines where NM is supposed to control resolv.conf.
nm_controlled_resolv: False
dns1: "10.5.126.21"
dns2: "10.5.126.22"

4
roles/base/templates/ifcfg.j2
View file

@ -8,6 +8,9 @@ OPTIONS="layer2=1 portno=0"
{% endif %}
{% if item == "eth0" or item == "enc900" %}
GATEWAY="{{gw}}"
DOMAIN="phx2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org"
DNS1="{{ dns1 }}"
DNS2="{{ dns2 }}"
{% endif %}
HWADDR="{{ hostvars[inventory_hostname]['ansible_' + item]['macaddress']|upper }}"
IPADDR="{{ hostvars[inventory_hostname][item + '_ip'] }}"
@ -29,4 +32,3 @@ IPV6_DEFAULTDEV={{item}}
IPV6_DEFAULTGW={{ hostvars[inventory_hostname][item + '_ipv6_gw'] }}
IPV6_MTU=1280
{% endif %}
DOMAIN="phx2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org"