diff options
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/group_vars/vmhost-sk-2019vm/vars.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mimas-legacy.yml | 32 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mimas.yml | 88 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mimas2.yml | 65 | ||||
| -rw-r--r-- | inventory/hosts.ini | 9 |
5 files changed, 98 insertions, 100 deletions
diff --git a/inventory/group_vars/vmhost-sk-2019vm/vars.yml b/inventory/group_vars/vmhost-sk-2019vm/vars.yml index 7c0559dd..c24e997b 100644 --- a/inventory/group_vars/vmhost-sk-2019vm/vars.yml +++ b/inventory/group_vars/vmhost-sk-2019vm/vars.yml @@ -14,7 +14,7 @@ vm_host: ele-emc-ctrl: 137 ele-gwhetzner: 138 sgg-icecast: 141 - ch-mimas: 142 + ch-mimas-legacy: 142 sk-testvm: 253 sk-2019vm: 254 nat: yes @@ -26,7 +26,7 @@ vm_host: ele-emc-ctrl: 1 ele-gwhetzner: 2 sgg-icecast: 5 - ch-mimas: 6 + ch-mimas-legacy: 6 sk-testvm: 7 zfs: default: diff --git a/inventory/host_vars/ch-mimas-legacy.yml b/inventory/host_vars/ch-mimas-legacy.yml new file mode 100644 index 00000000..a15ebb43 --- /dev/null +++ b/inventory/host_vars/ch-mimas-legacy.yml @@ -0,0 +1,32 @@ +--- +install: + vm: + memory: 2G + numcpus: 4 + autostart: True + disks: + primary: /dev/vda + virtio: + vda: + type: zfs + name: root + size: 62g + interfaces: + - bridge: br-public + name: eth0 + +network: + nameservers: "{{ vm_host.network.dns }}" + domain: "{{ host_domain }}" + systemd_link: + interfaces: "{{ install.interfaces }}" + primary: &_network_primary_ + name: eth0 + address: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}" + gateway: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ansible.utils.ipaddr('address') }}" + template: overlay + overlay: "{{ (vm_host.network.bridges.public.overlays.default.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.overlays.default.offsets[inventory_hostname])).split('/')[0] }}" + interfaces: + - *_network_primary_ + +external_ip: "{{ network.primary.overlay }}" diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml index a15ebb43..ed292956 100644 --- a/inventory/host_vars/ch-mimas.yml +++ b/inventory/host_vars/ch-mimas.yml @@ -1,32 +1,64 @@ --- install: - vm: - memory: 2G - numcpus: 4 - autostart: True - disks: - primary: /dev/vda - virtio: - vda: - type: zfs - name: root - size: 62g - interfaces: - - bridge: br-public - name: eth0 + cloud: + credentials: + token: "{{ vault_hcloud_api_token }}" + server_name: "{{ host_name }}" -network: - nameservers: "{{ vm_host.network.dns }}" - domain: "{{ host_domain }}" - systemd_link: - interfaces: "{{ install.interfaces }}" - primary: &_network_primary_ - name: eth0 - address: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}" - gateway: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ansible.utils.ipaddr('address') }}" - template: overlay - overlay: "{{ (vm_host.network.bridges.public.overlays.default.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.overlays.default.offsets[inventory_hostname])).split('/')[0] }}" - interfaces: - - *_network_primary_ -external_ip: "{{ network.primary.overlay }}" +apt_repo_provider: hetzner + + +bind_option_empty_zones_enable: no +bind_option_allow_transfer: [] +bind_option_allow_recursion: + - localhost +bind_option_notify: 'no' + +bind_empty_onion_zone: yes +bind_slave_zones: + pan: + masters: + - 89.106.215.17 + - 2a02:3e0:407::17 + zones: + ## formerly known as self + - chaos-at-home.org + - chaox.org + - spreadspace.org + - spreadspace.com + - spreadspace.net + - spreadspace.systems + - elev8.at + - java-sucks.com + - xn--gh-via.org + - schaaas.at + ## formerly known as others + - gimpf.org + - movetogether.at + ## formerly known as otti + #- anytun.org + #- gsenger.com + #- wirdorange.org + #- xn--3-0fa.at + - 5.208.106.89.in-addr.arpa + - 5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.e.3.0.2.0.a.2.ip6.arpa + + realraum: + masters: + - 89.106.211.33 + - 2a02:3e0:4000:1::1 + zones: + - realraum.at + - r3.at + - hack-challenge.at + + funkfeuer: + masters: + - 193.33.150.114 + zones: + - ffgraz.net + - graz.funkfeuer.at + - 10.in-addr.arpa + - 150.33.193.in-addr.arpa + - 151.33.193.in-addr.arpa diff --git a/inventory/host_vars/ch-mimas2.yml b/inventory/host_vars/ch-mimas2.yml deleted file mode 100644 index 3c31e172..00000000 --- a/inventory/host_vars/ch-mimas2.yml +++ /dev/null @@ -1,65 +0,0 @@ ---- -install: - cloud: - credentials: - token: "{{ vault_hcloud_api_token }}" - server_name: "{{ host_name }}" - - -acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" - -bind_option_empty_zones_enable: no -bind_option_allow_transfer: [] -bind_option_allow_recursion: - - localhost -bind_option_notify: 'no' - -bind_empty_onion_zone: yes -bind_slave_zones: - pan: - masters: - - 89.106.215.17 - - 2a02:3e0:407::17 - zones: - ## formerly known as self - - chaos-at-home.org - - chaox.org - - spreadspace.org - - spreadspace.com - - spreadspace.net - - spreadspace.systems - - elev8.at - - java-sucks.com - - xn--gh-via.org - - schaaas.at - ## formerly known as others - - gimpf.org - - movetogether.at - ## formerly known as otti - #- anytun.org - #- gsenger.com - #- wirdorange.org - #- xn--3-0fa.at - - 5.208.106.89.in-addr.arpa - - 5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.e.3.0.2.0.a.2.ip6.arpa - - realraum: - masters: - - 89.106.211.33 - - 2a02:3e0:4000:1::1 - zones: - - realraum.at - - r3.at - - hack-challenge.at - - funkfeuer: - masters: - - 193.33.150.114 - zones: - - ffgraz.net - - graz.funkfeuer.at - - 10.in-addr.arpa - - 150.33.193.in-addr.arpa - - 151.33.193.in-addr.arpa - -apt_repo_provider: default diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 161384c3..cb8ce25a 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -42,8 +42,8 @@ ch-atlas host_name=atlas ch-pan host_name=pan ch-keyserver host_name=keyserver ch-testvm-atlas host_name=testvm-atlas +ch-mimas-legacy host_name=mimas ch-mimas host_name=mimas -ch-mimas2 host_name=mimas ch-testvm-hcloud host_name=testvm-hcloud ch-telesto host_name=telesto @@ -312,8 +312,7 @@ python_basename=python [python2] ch-prometheus-legacy ch-pan -ch-mimas -ch-mimas2 +ch-mimas-legacy s2-build sk-2019 sk-2019vm @@ -367,7 +366,7 @@ vmhost-ch-atlas-guests [vmhost-sk-2019vm-guests] sk-testvm sk-torrent -ch-mimas +ch-mimas-legacy ele-gwhetzner ele-emc-ctrl sgg-icecast @@ -463,7 +462,7 @@ sk-tomnext [hcloud] ch-testvm-hcloud -ch-mimas2 +ch-mimas ele-lt ele-coturn ele-jitsi |