external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Explicitly disable dnsmasq when in Appliance mode

Browse source 
otherwise dnsmasq will become active upon reboot because enable_services.yml
would still be acting upon local_vars.yml where dnsmasq_enabled is set to True
while there is not LAN interface available to bind the service to.
This commit is contained in:
Jerry Vonau 2018-10-09 11:48:40 -05:00
parent 44d2cfc0dd
commit bb6b3c2ab2
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/network/defaults/main.yml
View file

@ -65,8 +65,6 @@ services_externally_visible: False
# DNS / name resolution
dhcpd_install: True
dhcpd_enabled: True
#dhcp_service: ???? # Set in individual OS's /opt/iiab/iiab/vars/<OS>.yml for use in roles/network/tasks/dhcpd.yml
dhcp_service2: disabled # Proposed by @jvonau to solve #1184 -> PR #1185 during transition from named to dnsmasq, as required by roles/network/tasks/computed_services.yml
named_install: True
named_enabled: False
dnsmasq_enabled: True

11
roles/network/tasks/computed_services.yml
View file

@ -37,8 +37,17 @@
set_fact:
named_enabled: False
dhcpd_enabled: False
dnsmasq_enabled: True
dhcp_service2: "dnsmasq"
when: dnsmasq_install and dnsmasq_enabled and iiab_network_mode != "Appliance"
when: dnsmasq_install and iiab_network_mode != "Appliance"
- name: LAN not configured - dnsmasq
set_fact:
named_enabled: False
dhcpd_enabled: False
dnsmasq_enabled: False
dhcp_service2: "dnsmasq"
when: dnsmasq_install and iiab_network_mode == "Appliance"
- name: Add 'network' variable values (from computed_services.yml) to /etc/iiab/iiab.ini
ini_file: