From 0e45778cb9e465d90899b1c231e7b48204a45c54 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 6 Sep 2019 23:10:31 +0200 Subject: revert to sane group-names... step 1 of n --- inventory/group_vars/chaos-at-home-ap/main.yml | 48 +++++++++++++++ .../group_vars/chaos-at-home-switches/main.yml | 15 +++++ .../group_vars/chaos-at-home-vpn-extern/main.yml | 45 ++++++++++++++ inventory/group_vars/chaos-at-home/main.yml | 7 +++ inventory/group_vars/chaos-at-home/network.yml | 69 ++++++++++++++++++++++ inventory/group_vars/chaos_at_home/main.yml | 7 --- inventory/group_vars/chaos_at_home/network.yml | 69 ---------------------- inventory/group_vars/chaos_at_home_ap/main.yml | 48 --------------- .../group_vars/chaos_at_home_switches/main.yml | 15 ----- .../group_vars/chaos_at_home_vpn_extern/main.yml | 45 -------------- inventory/hosts.ini | 29 ++++----- 11 files changed, 197 insertions(+), 200 deletions(-) create mode 100644 inventory/group_vars/chaos-at-home-ap/main.yml create mode 100644 inventory/group_vars/chaos-at-home-switches/main.yml create mode 100644 inventory/group_vars/chaos-at-home-vpn-extern/main.yml create mode 100644 inventory/group_vars/chaos-at-home/main.yml create mode 100644 inventory/group_vars/chaos-at-home/network.yml delete mode 100644 inventory/group_vars/chaos_at_home/main.yml delete mode 100644 inventory/group_vars/chaos_at_home/network.yml delete mode 100644 inventory/group_vars/chaos_at_home_ap/main.yml delete mode 100644 inventory/group_vars/chaos_at_home_switches/main.yml delete mode 100644 inventory/group_vars/chaos_at_home_vpn_extern/main.yml (limited to 'inventory') diff --git a/inventory/group_vars/chaos-at-home-ap/main.yml b/inventory/group_vars/chaos-at-home-ap/main.yml new file mode 100644 index 00000000..eb05dfad --- /dev/null +++ b/inventory/group_vars/chaos-at-home-ap/main.yml @@ -0,0 +1,48 @@ +--- +network_mgmt_zone: "{{ network_zones.mgmt }}" + +accesspoint_wifi_channels: + 2g4: + ch-ap0: 5 + ch-ap1: 13 + 5g: + ch-ap0: 36 + ch-ap1: 48 + +accesspoint_zones: + lan: "{{ network_zones.lan.wifi }}" + iot: "{{ network_zones.iot.wifi }}" + + +accesspoint_network_zones: "{{ accesspoint_network_zones_yaml | from_yaml }}" +accesspoint_network_zones_yaml: | + {% for zone_name in accesspoint_zones.keys() %} + - name: "interface '{{ zone_name }}'" + options: + type: bridge + ifname: "{{ accesspoint_wired_interface }}.{{ network_zones[zone_name].vlan }}" + accept_ra: 0 + proto: none + {% endfor %} + + +## TODO: set up 802.11r see: +## * https://www.reddit.com/r/openwrt/comments/515oea/finally_got_80211r_roaming_working/ +## * https://gist.github.com/lg/998d3e908d547bd9972a6bb604df377b +accesspoint_wireless_ifaces: "{{ accesspoint_wireless_ifaces_yaml | from_yaml }}" +accesspoint_wireless_ifaces_yaml: | + {% for zone in accesspoint_zones.keys() %} + {% for freq in accesspoint_wireless_frequencies %} + - name: wifi-iface '{{ zone }}{{ freq }}' + options: + device: 'radio{{ freq }}' + network: '{{ zone }}' + mode: 'ap' + disassoc_low_ack: '1' + rsn_preauth: '1' + ssid: '{{ accesspoint_zones[zone].ssid }}' + encryption: '{{ accesspoint_zones[zone].encryption }}' + key: '{{ accesspoint_zones[zone].key }}' + {% endfor %} + {% endfor %} + diff --git a/inventory/group_vars/chaos-at-home-switches/main.yml b/inventory/group_vars/chaos-at-home-switches/main.yml new file mode 100644 index 00000000..fb72c9b1 --- /dev/null +++ b/inventory/group_vars/chaos-at-home-switches/main.yml @@ -0,0 +1,15 @@ +--- +switch_mgmt_zone: "{{ network_zones.mgmt }}" +switch_mgmt_interface: "Gi1/0/28" + +switch_vlans: "{{ switch_vlans_yaml | from_yaml }}" +switch_vlans_yaml: | + {% for zone_name in network_zones.keys() %} + - name: "{{ zone_name }}" + id: "{{ network_zones[zone_name].vlan }}" + {% endfor %} + +switch_interfaces: "{{ switch_interfaces_yaml | from_yaml }}" +switch_interfaces_yaml: | + - spec: range Gi1/0/1-27 + vlan: {{ network_zones['lan'].vlan }} diff --git a/inventory/group_vars/chaos-at-home-vpn-extern/main.yml b/inventory/group_vars/chaos-at-home-vpn-extern/main.yml new file mode 100644 index 00000000..2ada0a35 --- /dev/null +++ b/inventory/group_vars/chaos-at-home-vpn-extern/main.yml @@ -0,0 +1,45 @@ +--- +openvpn_ca_certificate: | + -----BEGIN CERTIFICATE----- + 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 + 6XrTyAc= + -----END CERTIFICATE----- + +openvpn_dhparams: "{{ vault_openvpn_dhparams }}" +openvpn_ta_key: "{{ vault_openvpn_ta_key }}" diff --git a/inventory/group_vars/chaos-at-home/main.yml b/inventory/group_vars/chaos-at-home/main.yml new file mode 100644 index 00000000..1d44eb7d --- /dev/null +++ b/inventory/group_vars/chaos-at-home/main.yml @@ -0,0 +1,7 @@ +--- +zsh_banner: chaos-at-home + +admin_user_group: +- "{{ equinox_user }}" + +ssh_allowusers_host: "{{ admin_user_group | map(attribute='name') | list }}" diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml new file mode 100644 index 00000000..d5e93a5f --- /dev/null +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -0,0 +1,69 @@ +--- +network_zones: + lan: + vlan: 28 + prefix: 192.168.28.0/24 + gw: 192.168.28.254 + dns: + - 192.168.28.254 + dhcp: + start: 100 + limit: 199 + offsets: + ch-auth: 88 + ch-prometheus: 99 + ch-prometheus-old: 250 + ch-gw-lan: 254 + wifi: + ssid: "chaos at home" + encryption: "psk2" + key: "{{ vault_wifi_keys.lan }}" + + iot: + vlan: 30 + prefix: 192.168.30.0/24 + dhcp: + start: 1 + limit: 199 + wifi: + ssid: "stuff at home" + encryption: "psk2" + key: "{{ vault_wifi_keys.iot }}" + + svc: + vlan: 32 + prefix: 192.168.32.0/24 + gw: 192.168.32.254 + dns: +# - 192.168.32.254 + - 9.9.9.9 + offsets: + ch-jump: 22 + ch-gw-lan: 28 + ch-stats: 10 + ch-web: 80 + ch-mail: 143 + ch-router: 254 + + mgmt: + vlan: 42 + prefix: 192.168.42.0/24 + offsets: + ch-jump: 22 + ch-prometheus: 99 + ch-sw0: 200 + ch-sw1: 201 + ch-ap0: 220 + ch-ap1: 221 + ch-gnocchi: 240 + ch-router: 241 + + magenta: + vlan: 329 + prefix: 62.99.185.128/30 + gw: 62.99.185.129 + dns: + - 195.58.160.194 + - 195.58.161.122 + offsets: + ch-router: 2 diff --git a/inventory/group_vars/chaos_at_home/main.yml b/inventory/group_vars/chaos_at_home/main.yml deleted file mode 100644 index 1d44eb7d..00000000 --- a/inventory/group_vars/chaos_at_home/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -zsh_banner: chaos-at-home - -admin_user_group: -- "{{ equinox_user }}" - -ssh_allowusers_host: "{{ admin_user_group | map(attribute='name') | list }}" diff --git a/inventory/group_vars/chaos_at_home/network.yml b/inventory/group_vars/chaos_at_home/network.yml deleted file mode 100644 index d5e93a5f..00000000 --- a/inventory/group_vars/chaos_at_home/network.yml +++ /dev/null @@ -1,69 +0,0 @@ ---- -network_zones: - lan: - vlan: 28 - prefix: 192.168.28.0/24 - gw: 192.168.28.254 - dns: - - 192.168.28.254 - dhcp: - start: 100 - limit: 199 - offsets: - ch-auth: 88 - ch-prometheus: 99 - ch-prometheus-old: 250 - ch-gw-lan: 254 - wifi: - ssid: "chaos at home" - encryption: "psk2" - key: "{{ vault_wifi_keys.lan }}" - - iot: - vlan: 30 - prefix: 192.168.30.0/24 - dhcp: - start: 1 - limit: 199 - wifi: - ssid: "stuff at home" - encryption: "psk2" - key: "{{ vault_wifi_keys.iot }}" - - svc: - vlan: 32 - prefix: 192.168.32.0/24 - gw: 192.168.32.254 - dns: -# - 192.168.32.254 - - 9.9.9.9 - offsets: - ch-jump: 22 - ch-gw-lan: 28 - ch-stats: 10 - ch-web: 80 - ch-mail: 143 - ch-router: 254 - - mgmt: - vlan: 42 - prefix: 192.168.42.0/24 - offsets: - ch-jump: 22 - ch-prometheus: 99 - ch-sw0: 200 - ch-sw1: 201 - ch-ap0: 220 - ch-ap1: 221 - ch-gnocchi: 240 - ch-router: 241 - - magenta: - vlan: 329 - prefix: 62.99.185.128/30 - gw: 62.99.185.129 - dns: - - 195.58.160.194 - - 195.58.161.122 - offsets: - ch-router: 2 diff --git a/inventory/group_vars/chaos_at_home_ap/main.yml b/inventory/group_vars/chaos_at_home_ap/main.yml deleted file mode 100644 index eb05dfad..00000000 --- a/inventory/group_vars/chaos_at_home_ap/main.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -network_mgmt_zone: "{{ network_zones.mgmt }}" - -accesspoint_wifi_channels: - 2g4: - ch-ap0: 5 - ch-ap1: 13 - 5g: - ch-ap0: 36 - ch-ap1: 48 - -accesspoint_zones: - lan: "{{ network_zones.lan.wifi }}" - iot: "{{ network_zones.iot.wifi }}" - - -accesspoint_network_zones: "{{ accesspoint_network_zones_yaml | from_yaml }}" -accesspoint_network_zones_yaml: | - {% for zone_name in accesspoint_zones.keys() %} - - name: "interface '{{ zone_name }}'" - options: - type: bridge - ifname: "{{ accesspoint_wired_interface }}.{{ network_zones[zone_name].vlan }}" - accept_ra: 0 - proto: none - {% endfor %} - - -## TODO: set up 802.11r see: -## * https://www.reddit.com/r/openwrt/comments/515oea/finally_got_80211r_roaming_working/ -## * https://gist.github.com/lg/998d3e908d547bd9972a6bb604df377b -accesspoint_wireless_ifaces: "{{ accesspoint_wireless_ifaces_yaml | from_yaml }}" -accesspoint_wireless_ifaces_yaml: | - {% for zone in accesspoint_zones.keys() %} - {% for freq in accesspoint_wireless_frequencies %} - - name: wifi-iface '{{ zone }}{{ freq }}' - options: - device: 'radio{{ freq }}' - network: '{{ zone }}' - mode: 'ap' - disassoc_low_ack: '1' - rsn_preauth: '1' - ssid: '{{ accesspoint_zones[zone].ssid }}' - encryption: '{{ accesspoint_zones[zone].encryption }}' - key: '{{ accesspoint_zones[zone].key }}' - {% endfor %} - {% endfor %} - diff --git a/inventory/group_vars/chaos_at_home_switches/main.yml b/inventory/group_vars/chaos_at_home_switches/main.yml deleted file mode 100644 index fb72c9b1..00000000 --- a/inventory/group_vars/chaos_at_home_switches/main.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -switch_mgmt_zone: "{{ network_zones.mgmt }}" -switch_mgmt_interface: "Gi1/0/28" - -switch_vlans: "{{ switch_vlans_yaml | from_yaml }}" -switch_vlans_yaml: | - {% for zone_name in network_zones.keys() %} - - name: "{{ zone_name }}" - id: "{{ network_zones[zone_name].vlan }}" - {% endfor %} - -switch_interfaces: "{{ switch_interfaces_yaml | from_yaml }}" -switch_interfaces_yaml: | - - spec: range Gi1/0/1-27 - vlan: {{ network_zones['lan'].vlan }} diff --git a/inventory/group_vars/chaos_at_home_vpn_extern/main.yml b/inventory/group_vars/chaos_at_home_vpn_extern/main.yml deleted file mode 100644 index 2ada0a35..00000000 --- a/inventory/group_vars/chaos_at_home_vpn_extern/main.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -openvpn_ca_certificate: | - -----BEGIN CERTIFICATE----- - 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 - 6XrTyAc= - -----END CERTIFICATE----- - -openvpn_dhparams: "{{ vault_openvpn_dhparams }}" -openvpn_ta_key: "{{ vault_openvpn_ta_key }}" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 8f7c92ba..bf2c0fb3 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -1,6 +1,5 @@ [all:vars] host_name={{ inventory_hostname }} -#ansible_host={{ host_name }}.{{ host_domain }} ansible_user=root ansible_port=22000 @@ -8,13 +7,12 @@ ansible_port=22000 ############################### # environment: chaos-at-home -[chaos_at_home:vars] +[chaos-at-home:vars] host_domain=chaos-at-home.org env_group=chaos-at-home -#ansible_host={{ host_name }}.{{ host_domain }} ansible_port=222 -[chaos_at_home] +[chaos-at-home] ch-atlas host_name=atlas ch-pan host_name=pan ch-keyserver host_name=keyserver @@ -24,28 +22,28 @@ ch-router host_name=router ch-gw-lan host_name=gw-lan ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump -[chaos_at_home:children] -mz_chaos_at_home -chaos_at_home_switches -chaos_at_home_ap +[chaos-at-home:children] +mz-chaos-at-home +chaos-at-home-switches +chaos-at-home-ap -[mz_chaos_at_home] +[mz-chaos-at-home] mz-router ansible_host=chmz-router mz-ap ansible_host=chmz-ap -[chaos_at_home_switches:vars] +[chaos-at-home-switches:vars] ansible_port=22 -[chaos_at_home_switches] +[chaos-at-home-switches] ch-sw0 host_name=sw0 ansible_host=192.168.42.200 ch-sw1 host_name=sw1 ansible_host=192.168.42.201 -[chaos_at_home_ap] +[chaos-at-home-ap] ch-ap0 host_name=ap0 ch-ap1 host_name=ap1 -[chaos_at_home_vpn_extern] +[chaos-at-home-vpn-extern] ch-router ch-pan @@ -78,7 +76,6 @@ r3-cccamp19-av host_name=av [spreadspace:vars] host_domain=spreadspace.org env_group=spreadspace -ansible_host={{ host_name }}.{{ host_domain }} ansible_port=222 [spreadspace] @@ -169,7 +166,7 @@ ele_infobeamer r3-cccamp19-sw0 [dellos6:children] -chaos_at_home_switches +chaos-at-home-switches [kvmhosts] @@ -224,7 +221,7 @@ scaleway_kernel [accesspoints:children] ele_ap -chaos_at_home_ap +chaos-at-home-ap [dolmetsch_ctl:children] ele_dolmetsch_ctl -- cgit v1.2.3