From 3eccbd9d60aa7acbbd478e2042e9ac39ee6cc770 Mon Sep 17 00:00:00 2001 From: holta Date: Fri, 24 May 2019 03:06:43 -0400 Subject: [PATCH] '| bool' for Ansible 2.8; prep U18+ --- roles/network/tasks/avahi.yml | 4 ++-- roles/network/tasks/computed_network.yml | 4 ++-- roles/network/tasks/dansguardian.yml | 2 +- roles/network/tasks/debian.yml | 4 ++-- roles/network/tasks/detected_network.yml | 4 ++-- roles/network/tasks/dhcpd.yml | 14 +++++++------- roles/network/tasks/down-debian.yml | 4 ++-- roles/network/tasks/hostapd.yml | 4 ++-- roles/network/tasks/ifcfg_mods.yml | 4 ++-- roles/network/tasks/main.yml | 4 ++-- roles/network/tasks/named.yml | 4 ++-- roles/network/tasks/netplan.yml | 2 +- roles/network/tasks/redetect.yml | 4 ++-- roles/network/tasks/squid.yml | 4 ++-- roles/network/tasks/sysd-netd-debian.yml | 5 +++-- 15 files changed, 34 insertions(+), 33 deletions(-) diff --git a/roles/network/tasks/avahi.yml b/roles/network/tasks/avahi.yml index b3db97db1..8639e7758 100644 --- a/roles/network/tasks/avahi.yml +++ b/roles/network/tasks/avahi.yml @@ -3,7 +3,7 @@ name: avahi createhome: no shell: /bin/false - when: is_debuntu + when: is_debuntu | bool - name: Install avahi announce config file /etc/avahi/services/schoolserver.service template: @@ -37,7 +37,7 @@ copy: src: /usr/share/doc/avahi-daemon/examples/ssh.service dest: /etc/avahi/services/ - when: is_debuntu + when: is_debuntu | bool - name: Set ssh port for avahi lineinfile: diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml index 57b48ba06..9f2fed302 100644 --- a/roles/network/tasks/computed_network.yml +++ b/roles/network/tasks/computed_network.yml @@ -60,7 +60,7 @@ - name: Checking iiab_wan_enabled set_fact: user_wan_iface: "none" - when: 'not iiab_wan_enabled' + when: not iiab_wan_enabled # gui wants LanController # keeps ifcfg-WAN but onboot=no # the change over might be a little bumpy ATM. @@ -141,7 +141,7 @@ set_fact: iiab_lan_iface: "br0" iiab_wireless_lan_iface: "wlan0" - when: is_rpi + when: is_rpi | bool - name: Enable hostapd if discovered_wireless_iface is not WAN set_fact: diff --git a/roles/network/tasks/dansguardian.yml b/roles/network/tasks/dansguardian.yml index 4433716fc..7f76cfb5b 100644 --- a/roles/network/tasks/dansguardian.yml +++ b/roles/network/tasks/dansguardian.yml @@ -21,7 +21,7 @@ owner: dansguardian group: dansguardian mode: 0640 - when: is_debuntu + when: is_debuntu | bool - name: Install /etc/dansguardian/dansguardian.conf from template (CentOS) template: diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index 1f9101e9c..0c18c323b 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -73,13 +73,13 @@ service: name: dhcpd state: stopped - when: dhcpd_install + when: dhcpd_install | bool - name: dhcpd_server may be affected - stopping dnsmasq service: name: dnsmasq state: stopped - when: dnsmasq_install + when: dnsmasq_install | bool - name: Reload systemd systemd: diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 11fb3bcfa..457947b84 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -17,7 +17,7 @@ - name: Red Hat network detection (redhat) include_tasks: detected_redhat.yml - when: is_redhat + when: is_redhat | bool - name: Setting dhcpcd_test results set_fact: @@ -40,7 +40,7 @@ - name: Check /etc/network/interfaces for gateway shell: grep {{ device_gw }} /etc/network/interfaces | wc -l - when: is_debuntu + when: is_debuntu | bool register: wan_file - name: Setting wan_in_interfaces diff --git a/roles/network/tasks/dhcpd.yml b/roles/network/tasks/dhcpd.yml index 2a7aee006..1b46b0238 100644 --- a/roles/network/tasks/dhcpd.yml +++ b/roles/network/tasks/dhcpd.yml @@ -2,7 +2,7 @@ package: name: isc-dhcp-server state: present - when: is_debuntu + when: is_debuntu | bool tags: - download @@ -18,21 +18,21 @@ user: name: dhcpd createhome: no - when: is_debuntu + when: is_debuntu | bool - name: Disable stock dhcp_service (debuntu) service: name: "{{ dhcp_service }}" enabled: no state: stopped - when: is_debuntu + when: is_debuntu | bool -- name: Disable stock dhcp_service ipv6 (ubuntu-18) +- name: Disable stock dhcp_service ipv6 (ubuntu-18 and higher) service: name: "{{ dhcp_service }}6" enabled: no state: stopped - when: is_ubuntu_18 + when: is_ubuntu and not is_ubuntu_16 - name: Install systemd unit file to /etc/systemd/system/dhcpd.service template: @@ -48,7 +48,7 @@ command: touch /var/lib/dhcpd/dhcpd.leases args: creates: /var/lib/dhcpd/dhcpd.leases - when: is_redhat + when: is_redhat | bool - name: Set dhcpd.leases permissions/ownership (redhat) file: @@ -57,4 +57,4 @@ group: dhcpd mode: 0644 state: file - when: is_redhat + when: is_redhat | bool diff --git a/roles/network/tasks/down-debian.yml b/roles/network/tasks/down-debian.yml index c5954a72a..fb5589d0f 100644 --- a/roles/network/tasks/down-debian.yml +++ b/roles/network/tasks/down-debian.yml @@ -16,10 +16,10 @@ service: name: dhcpd state: stopped - when: dhcpd_install + when: dhcpd_install | bool - name: dhcpd_server may be affected - stopping dnsmasq service: name: dnsmasq state: stopped - when: dnsmasq_install + when: dnsmasq_install | bool diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml index f44cce108..3447c2b6b 100644 --- a/roles/network/tasks/hostapd.yml +++ b/roles/network/tasks/hostapd.yml @@ -31,7 +31,7 @@ owner: root group: root mode: 0755 - when: is_rpi + when: is_rpi | bool - name: Create /usr/bin/iiab-hotspot-off from template template: @@ -40,7 +40,7 @@ owner: root group: root mode: 0755 - when: is_rpi + when: is_rpi | bool - name: Disable the Access Point 'hostapd' service systemd: diff --git a/roles/network/tasks/ifcfg_mods.yml b/roles/network/tasks/ifcfg_mods.yml index 444f3241f..98073f580 100644 --- a/roles/network/tasks/ifcfg_mods.yml +++ b/roles/network/tasks/ifcfg_mods.yml @@ -36,13 +36,13 @@ service: name: dhcpd state: stopped - when: dhcpd_install + when: dhcpd_install | bool - name: dhcpd_server may be affected - stopping dnsmasq service: name: dnsmasq state: stopped - when: dnsmasq_install + when: dnsmasq_install | bool - name: Stop the LAN/Bridge deleting iiab-LAN shell: nmcli con delete id iiab-LAN diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 5f2fa02a5..d44449973 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -57,7 +57,7 @@ - name: Configure wondershaper include_tasks: wondershaper.yml - when: wondershaper_install + when: wondershaper_install | bool tags: - network - wondershaper @@ -99,7 +99,7 @@ #### Start network layout - name: Redhat networking include_tasks: ifcfg_mods.yml - when: is_redhat + when: is_redhat | bool #and not installing tags: - network diff --git a/roles/network/tasks/named.yml b/roles/network/tasks/named.yml index d3b03382f..37343c9fa 100644 --- a/roles/network/tasks/named.yml +++ b/roles/network/tasks/named.yml @@ -4,7 +4,7 @@ - bind9 - bind9utils state: present - when: is_debuntu + when: is_debuntu | bool tags: - download @@ -79,7 +79,7 @@ template: src: roles/network/templates/named/dns-jail.conf dest: "/etc/{{ apache_config_dir }}/" - when: dns_jail_enabled + when: dns_jail_enabled | bool - name: Create symlink dns-jail.conf from sites-enabled to sites-available (if debuntu and dns_jail_enabled) file: diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml index b9fd2bd40..69959b77f 100644 --- a/roles/network/tasks/netplan.yml +++ b/roles/network/tasks/netplan.yml @@ -27,7 +27,7 @@ enabled: yes with_items: - systemd-networkd-wait-online - when: systemd_networkd_active + when: systemd_networkd_active | bool # ICO will always set gui_static_wan_ip away from the default of 'unset' while # gui_static_wan turns dhcp on/off through wan_ip in computed_network and diff --git a/roles/network/tasks/redetect.yml b/roles/network/tasks/redetect.yml index 47cf687d3..dd01ada0d 100644 --- a/roles/network/tasks/redetect.yml +++ b/roles/network/tasks/redetect.yml @@ -57,7 +57,7 @@ shell: nmcli conn up id iiab-WAN register: dhcp_WAN ignore_errors: yes - when: has_WAN + when: has_WAN | bool - name: BAD ifcfg-WAN debug: @@ -117,7 +117,7 @@ register: ifcfg_dhcp_device ignore_errors: True changed_when: False - when: dhcp_good + when: dhcp_good | bool - name: Setting has ifcfg gw based on device if found set_fact: diff --git a/roles/network/tasks/squid.yml b/roles/network/tasks/squid.yml index 6b71e882c..55cb28fcd 100644 --- a/roles/network/tasks/squid.yml +++ b/roles/network/tasks/squid.yml @@ -9,7 +9,7 @@ - name: "Bigger hammer for Ubuntu, run: /etc/init.d/squid stop" command: /etc/init.d/squid stop - when: is_ubuntu + when: is_ubuntu | bool - name: Stop Squid service: @@ -79,7 +79,7 @@ state: directory - include_tasks: roles/network/tasks/dansguardian.yml - when: dansguardian_install + when: dansguardian_install | bool # {{ proxy }} is normally "squid", but is "squid3" on raspbian-8 & debian-8 - name: Add '{{ proxy }}' variable values to {{ iiab_ini_file }} diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index bfacace0d..7bc70071b 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -33,11 +33,12 @@ wan_cidr: "{{ CIDR.stdout }}" when: wan_ip != "dhcp" -- name: Supply static WAN template +- name: Supply static WAN template (ubuntu-16) template: dest: /etc/systemd/network/IIAB-Static.network src: network/systemd-static-net.j2 - when: wan_ip != "dhcp" and not is_ubuntu_18 + when: wan_ip != "dhcp" and is_ubuntu_16 + #when: wan_ip != "dhcp" and not is_ubuntu_18 - name: Stopping services include_tasks: down-debian.yml