1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-15 04:32:11 +00:00

Experimentally comment out tags from network/tasks/main.yml

This commit is contained in:
A Holt 2020-01-13 12:13:11 -05:00 committed by GitHub
parent 4912114b7b
commit d4906db5ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,8 +1,6 @@
- include_tasks: detected_network.yml - include_tasks: detected_network.yml
when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml when: not installing # REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml
tags: #tags: network, network-discover # REMOVE SUCH LINES (BELOW TOO) AS WE'RE IN "network" ?
- network #REMOVE SUCH LINES (BELOW TOO) AS WE'RE IN "network" ?
- network-discover
- name: IF WIFI IS PRIMARY GATEWAY, PLEASE RUN 'iiab-hotspot-on' MANUALLY - name: IF WIFI IS PRIMARY GATEWAY, PLEASE RUN 'iiab-hotspot-on' MANUALLY
set_fact: set_fact:
@ -29,14 +27,10 @@
- include_tasks: computed_network.yml - include_tasks: computed_network.yml
when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml when: not installing #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml
tags: #tags: network, network-discover
- network
- network-discover
- include_tasks: hostapd.yml - include_tasks: hostapd.yml
tags: #tags: network, AP
- network
- AP
#- name: RPi - don't reboot to AP post install - installed via wifi - don't blow away current network #- name: RPi - don't reboot to AP post install - installed via wifi - don't blow away current network
# set_fact: # set_fact:
@ -50,17 +44,12 @@
##### End static ip address info ##### End static ip address info
#- include_tasks: hosts.yml #- include_tasks: hosts.yml
# tags: # tags: network, hostname, domain
# - network
# - hostname
# - domain
- name: Configure wondershaper - name: Configure wondershaper
include_tasks: wondershaper.yml include_tasks: wondershaper.yml
when: wondershaper_install | bool or wondershaper_installed is defined when: wondershaper_install | bool or wondershaper_installed is defined
tags: #tags: network, wondershaper
- network
- wondershaper
- name: (Re)Install named - name: (Re)Install named
include_tasks: named.yml include_tasks: named.yml
@ -76,24 +65,13 @@
#### start services #### start services
- include_tasks: avahi.yml - include_tasks: avahi.yml
tags: #tags: network
- network
- include_tasks: computed_services.yml - include_tasks: computed_services.yml
tags: #tags: network, named, dhcpd, dnsmasq, squid
- network
- named
- dhcpd
- dnsmasq
- squid
- include_tasks: enable_services.yml - include_tasks: enable_services.yml
tags: #tags: network, named, dhcpd, dnsmasq, squid
- network
- named
- dhcpd
- dnsmasq
- squid
#### end services #### end services
#### Start network layout #### Start network layout
@ -101,52 +79,40 @@
include_tasks: ifcfg_mods.yml include_tasks: ifcfg_mods.yml
when: is_redhat | bool when: is_redhat | bool
#and not installing #and not installing
tags: #tags: network
- network
- name: Netplan in use on Ubuntu 18.04+ - name: Netplan in use on Ubuntu 18.04+
include_tasks: netplan.yml include_tasks: netplan.yml
when: is_ubuntu and not is_ubuntu_16 when: is_ubuntu and not is_ubuntu_16
#when: is_ubuntu_18 | bool #when: is_ubuntu_18 | bool
#and not installing #and not installing
tags: #tags: network
- network
- name: NetworkManager in use - name: NetworkManager in use
include_tasks: NM-debian.yml include_tasks: NM-debian.yml
when: is_debuntu and network_manager_active when: is_debuntu and network_manager_active
#and not installing #and not installing
tags: #tags: network
- network
- name: systemd-networkd in use - name: systemd-networkd in use
include_tasks: sysd-netd-debian.yml include_tasks: sysd-netd-debian.yml
when: is_debuntu and systemd_networkd_active when: is_debuntu and systemd_networkd_active
#and not installing #and not installing
tags: #tags: network
- network
- name: RPi's have dhcpcd in use - name: RPi's have dhcpcd in use
include_tasks: rpi_debian.yml include_tasks: rpi_debian.yml
when: is_debuntu and is_rpi when: is_debuntu and is_rpi
#and not installing #and not installing
tags: #tags: network
- network
- name: Not RPi, Not NetworkManager, Not systemd-networkd in use - name: Not RPi, Not NetworkManager, Not systemd-networkd in use
include_tasks: debian.yml include_tasks: debian.yml
when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16 when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16
#and not installing #and not installing
tags: #tags: network
- network
#### end network layout #### end network layout
- include_tasks: restart.yml - include_tasks: restart.yml
when: not installing when: not installing
tags: #tags: network, named, dhcpd, dnsmasq, squid, AP
- network
- named
- dhcpd
- dnsmasq
- squid
- AP