From af558c465741995f184286a488fe45155b5ac663 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 9 Jan 2022 04:24:36 +0100 Subject: move ch-gnocchi to graveyard --- _graveyard_/chaos-at-home/ch-gnocchi.yml | 13 +++++++++ .../inventory/group_vars/chaos-at-home/network.yml | 5 ++++ .../inventory/group_vars/chaos-at-home/vars.yml | 13 +++++++++ .../group_vars/vmhost-ch-gnocchi/vars.yml | 25 ++++++++++++++++ _graveyard_/inventory/host_vars/ch-gnocchi.yml | 33 ++++++++++++++++++++++ _graveyard_/inventory/hosts.ini | 15 ++++++++++ chaos-at-home/ch-gnocchi.yml | 13 --------- inventory/group_vars/chaos-at-home/network.yml | 1 - inventory/group_vars/vmhost-ch-gnocchi/vars.yml | 25 ---------------- inventory/host_vars/ch-gnocchi.yml | 33 ---------------------- inventory/hosts.ini | 13 +-------- 11 files changed, 105 insertions(+), 84 deletions(-) create mode 100644 _graveyard_/chaos-at-home/ch-gnocchi.yml create mode 100644 _graveyard_/inventory/group_vars/chaos-at-home/network.yml create mode 100644 _graveyard_/inventory/group_vars/chaos-at-home/vars.yml create mode 100644 _graveyard_/inventory/group_vars/vmhost-ch-gnocchi/vars.yml create mode 100644 _graveyard_/inventory/host_vars/ch-gnocchi.yml delete mode 100644 chaos-at-home/ch-gnocchi.yml delete mode 100644 inventory/group_vars/vmhost-ch-gnocchi/vars.yml delete mode 100644 inventory/host_vars/ch-gnocchi.yml diff --git a/_graveyard_/chaos-at-home/ch-gnocchi.yml b/_graveyard_/chaos-at-home/ch-gnocchi.yml new file mode 100644 index 00000000..ba7b9add --- /dev/null +++ b/_graveyard_/chaos-at-home/ch-gnocchi.yml @@ -0,0 +1,13 @@ +--- +- name: Basic Setup + hosts: ch-gnocchi + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/cpu-microcode + - role: vm/host/base + - role: vm/host/network + - role: installer/debian/base + - role: installer/openbsd/base diff --git a/_graveyard_/inventory/group_vars/chaos-at-home/network.yml b/_graveyard_/inventory/group_vars/chaos-at-home/network.yml new file mode 100644 index 00000000..0437d77d --- /dev/null +++ b/_graveyard_/inventory/group_vars/chaos-at-home/network.yml @@ -0,0 +1,5 @@ +--- +network_zones: + mgmt: + offsets: + ch-gnocchi: 240 diff --git a/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml b/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml new file mode 100644 index 00000000..8e1f3db1 --- /dev/null +++ b/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml @@ -0,0 +1,13 @@ +--- +zsh_banner: chaos-at-home + +admin_users_group: + - equinox + +acmetool_account_email: admin@chaos-at-home.org + +apt_repo_provider: anexia + +apt_repo_blackmagic_auth: + username: "chaos-at-home" + password: "{{ vault_apt_repo_blackmagic_auth.password }}" diff --git a/_graveyard_/inventory/group_vars/vmhost-ch-gnocchi/vars.yml b/_graveyard_/inventory/group_vars/vmhost-ch-gnocchi/vars.yml new file mode 100644 index 00000000..852b905c --- /dev/null +++ b/_graveyard_/inventory/group_vars/vmhost-ch-gnocchi/vars.yml @@ -0,0 +1,25 @@ +--- +__vmhost_bridge_interface_zones__: + enp1s0: + - lan + - svc + enp2s0: + - magenta + enp3s0: + - mgmt + - iot + +__vmhost_bridge_interface_zones_yaml__: | + {% for interface in (__vmhost_bridge_interface_zones__.keys() | sort) %} + {% for zone in __vmhost_bridge_interface_zones__[interface] %} + {{ zone }}: + interfaces: + - {{ interface }}.{{ network_zones[zone].vlan }} + {% endfor %} + {% endfor %} + + +vm_host: + name: ch-gnocchi + network: + bridges: "{{ __vmhost_bridge_interface_zones_yaml__ | from_yaml }}" diff --git a/_graveyard_/inventory/host_vars/ch-gnocchi.yml b/_graveyard_/inventory/host_vars/ch-gnocchi.yml new file mode 100644 index 00000000..f0b5ab11 --- /dev/null +++ b/_graveyard_/inventory/host_vars/ch-gnocchi.yml @@ -0,0 +1,33 @@ +--- +install_interface: enp2s0 +install_dhcp: true + +install: + disks: + primary: /dev/disk/by-id/ata-Samsung_SSD_860_EVO_mSATA_250GB_S41MNC0KA13977X + kernel_cmdline: + - console=ttyS0,115200n8 + +network: + domain: "{{ host_domain }}" + interfaces: + - name: br-mgmt + address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + vlans: + enp1s0: "{{ __vmhost_bridge_interface_zones__['enp1s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}" + enp2s0: "{{ __vmhost_bridge_interface_zones__['enp2s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}" + enp3s0: "{{ __vmhost_bridge_interface_zones__['enp3s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}" + + +apt_repo_components: + - main + - contrib + - non-free ## for microcode updates + + +installer_storage: + type: lvm + vg: "{{ host_name }}" + lv: installer + size: 10G + fs: ext4 diff --git a/_graveyard_/inventory/hosts.ini b/_graveyard_/inventory/hosts.ini index dc326c3d..bc1fafdb 100644 --- a/_graveyard_/inventory/hosts.ini +++ b/_graveyard_/inventory/hosts.ini @@ -1,6 +1,10 @@ ############################### # environment: chaos-at-home +[chaos-at-home] +ch-gnocchi host_name=gnocchi + + [realraum:children] r3-cccamp19 @@ -36,7 +40,16 @@ ele-dolmetsch-ctl r3-cccamp19-sw0 +## virtualization +[vmhost-ch-gnocchi-guests] +[vmhost-ch-gnocchi] +ch-gnocchi +[vmhost-ch-gnocchi:children] +vmhost-ch-gnocchi-guests + + [kvmhosts] +ch-gnocchi r3-cccamp19-dione r3-cccamp19-helene @@ -45,6 +58,8 @@ r3-cccamp19-flora r3-cccamp19-verr r3-cccamp19-feedcode r3-cccamp19-av +[kvmguests:children] +vmhost-ch-gnocchi-guests [dolmetsch-ctl:children] diff --git a/chaos-at-home/ch-gnocchi.yml b/chaos-at-home/ch-gnocchi.yml deleted file mode 100644 index ba7b9add..00000000 --- a/chaos-at-home/ch-gnocchi.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: Basic Setup - hosts: ch-gnocchi - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/cpu-microcode - - role: vm/host/base - - role: vm/host/network - - role: installer/debian/base - - role: installer/openbsd/base diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 6807c104..36509588 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -99,7 +99,6 @@ network_zones: ch-ap0: 220 ch-ap1: 221 ch-mon: 230 - ch-gnocchi: 240 ch-router: 241 magenta: diff --git a/inventory/group_vars/vmhost-ch-gnocchi/vars.yml b/inventory/group_vars/vmhost-ch-gnocchi/vars.yml deleted file mode 100644 index 852b905c..00000000 --- a/inventory/group_vars/vmhost-ch-gnocchi/vars.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -__vmhost_bridge_interface_zones__: - enp1s0: - - lan - - svc - enp2s0: - - magenta - enp3s0: - - mgmt - - iot - -__vmhost_bridge_interface_zones_yaml__: | - {% for interface in (__vmhost_bridge_interface_zones__.keys() | sort) %} - {% for zone in __vmhost_bridge_interface_zones__[interface] %} - {{ zone }}: - interfaces: - - {{ interface }}.{{ network_zones[zone].vlan }} - {% endfor %} - {% endfor %} - - -vm_host: - name: ch-gnocchi - network: - bridges: "{{ __vmhost_bridge_interface_zones_yaml__ | from_yaml }}" diff --git a/inventory/host_vars/ch-gnocchi.yml b/inventory/host_vars/ch-gnocchi.yml deleted file mode 100644 index f0b5ab11..00000000 --- a/inventory/host_vars/ch-gnocchi.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -install_interface: enp2s0 -install_dhcp: true - -install: - disks: - primary: /dev/disk/by-id/ata-Samsung_SSD_860_EVO_mSATA_250GB_S41MNC0KA13977X - kernel_cmdline: - - console=ttyS0,115200n8 - -network: - domain: "{{ host_domain }}" - interfaces: - - name: br-mgmt - address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - vlans: - enp1s0: "{{ __vmhost_bridge_interface_zones__['enp1s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}" - enp2s0: "{{ __vmhost_bridge_interface_zones__['enp2s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}" - enp3s0: "{{ __vmhost_bridge_interface_zones__['enp3s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}" - - -apt_repo_components: - - main - - contrib - - non-free ## for microcode updates - - -installer_storage: - type: lvm - vg: "{{ host_name }}" - lv: installer - size: 10G - fs: ext4 diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 6802f77c..b7f02e0d 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -13,7 +13,6 @@ host_domain=chaos-at-home.org env_group=chaos-at-home [chaos-at-home] -ch-gnocchi host_name=gnocchi ch-phoebe host_name=phoebe ch-testvm-phoebe host_name=testvm-phoebe ch-testvm-openwrt host_name=testvm-openwrt @@ -330,7 +329,6 @@ ch-prometheus-legacy ch-pan ch-mimas ch-mimas2 -ch-gnocchi s2-build lw-master sk-2019 @@ -344,13 +342,6 @@ ele-gwhetzner ## virtualization -[vmhost-ch-gnocchi-guests] -ch-nic -[vmhost-ch-gnocchi] -ch-gnocchi -[vmhost-ch-gnocchi:children] -vmhost-ch-gnocchi-guests - [vmhost-ch-phoebe-guests] ch-testvm-phoebe ch-testvm-openwrt @@ -358,7 +349,7 @@ ch-router ch-router-obsd ch-jump ch-gw-lan -#ch-nic +ch-nic [vmhost-ch-phoebe] ch-phoebe [vmhost-ch-phoebe:children] @@ -421,7 +412,6 @@ vmhost-ele-telesto-guests [kvmhosts] -ch-gnocchi ch-phoebe ch-prometheus ch-atlas @@ -430,7 +420,6 @@ sk-tomnext ele-telesto [kvmguests:children] -vmhost-ch-gnocchi-guests vmhost-ch-phoebe-guests vmhost-ch-prometheus-guests vmhost-ch-atlas-guests -- cgit v1.2.3