From 10a31c6e265db5f7486d58775392df031cce614c Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 20 May 2023 21:04:11 +0200 Subject: move ch-omd to graveyard --- _graveyard_/chaos-at-home/ch-omd.yml | 10 ++++ .../inventory/group_vars/chaos-at-home/network.yml | 4 ++ _graveyard_/inventory/host_vars/ch-omd.yml | 55 ++++++++++++++++++++++ _graveyard_/inventory/hosts.ini | 4 ++ chaos-at-home/ch-omd.yml | 10 ---- inventory/group_vars/chaos-at-home/network.yml | 1 - inventory/host_vars/ch-omd.yml | 55 ---------------------- inventory/hosts.ini | 2 - 8 files changed, 73 insertions(+), 68 deletions(-) create mode 100644 _graveyard_/chaos-at-home/ch-omd.yml create mode 100644 _graveyard_/inventory/host_vars/ch-omd.yml delete mode 100644 chaos-at-home/ch-omd.yml delete mode 100644 inventory/host_vars/ch-omd.yml diff --git a/_graveyard_/chaos-at-home/ch-omd.yml b/_graveyard_/chaos-at-home/ch-omd.yml new file mode 100644 index 00000000..35d48ce9 --- /dev/null +++ b/_graveyard_/chaos-at-home/ch-omd.yml @@ -0,0 +1,10 @@ +--- +- name: Basic Setup + hosts: ch-omd + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp +# - role: apt-repo/consol-labs diff --git a/_graveyard_/inventory/group_vars/chaos-at-home/network.yml b/_graveyard_/inventory/group_vars/chaos-at-home/network.yml index 0437d77d..dd541798 100644 --- a/_graveyard_/inventory/group_vars/chaos-at-home/network.yml +++ b/_graveyard_/inventory/group_vars/chaos-at-home/network.yml @@ -1,5 +1,9 @@ --- network_zones: + svc: + offsets: + ch-omd: 231 + mgmt: offsets: ch-gnocchi: 240 diff --git a/_graveyard_/inventory/host_vars/ch-omd.yml b/_graveyard_/inventory/host_vars/ch-omd.yml new file mode 100644 index 00000000..80c6d632 --- /dev/null +++ b/_graveyard_/inventory/host_vars/ch-omd.yml @@ -0,0 +1,55 @@ +--- +install_jumphost: ch-jump + +install: + vm: + memory: 8G + numcpus: 4 + autostart: yes + disks: + primary: /dev/sda + scsi: + sda: + type: zfs + name: root + size: 50g + system_lvm: + volumes: + - name: root + size: 3G + filesystem: ext4 + mountpoint: / + - name: var + size: 1280M + filesystem: ext4 + mountpoint: /var + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec + - name: opt + size: 10G + filesystem: ext4 + mountpoint: /opt + interfaces: + - bridge: br-svc + name: svc0 + +network: + nameservers: "{{ network_zones.svc.dns }}" + domain: "{{ host_domain }}" + systemd_link: + interfaces: "{{ install.interfaces }}" + primary: &_network_primary_ + name: svc0 + address: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.svc.gateway }}" + static_routes: + - destination: "{{ network_zones.lan.prefix }}" + gateway: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ansible.utils.ipaddr('address') }}" + interfaces: + - *_network_primary_ diff --git a/_graveyard_/inventory/hosts.ini b/_graveyard_/inventory/hosts.ini index 2b79221f..41bf5d84 100644 --- a/_graveyard_/inventory/hosts.ini +++ b/_graveyard_/inventory/hosts.ini @@ -3,6 +3,7 @@ [chaos-at-home] ch-gnocchi host_name=gnocchi +ch-omd host_name=omd [realraum:children] @@ -77,6 +78,9 @@ ch-gnocchi [vmhost-ch-gnocchi:children] vmhost-ch-gnocchi-guests +[vmhost-ch-prometheus-guests] +ch-omd + [kvmhosts] ch-gnocchi diff --git a/chaos-at-home/ch-omd.yml b/chaos-at-home/ch-omd.yml deleted file mode 100644 index 35d48ce9..00000000 --- a/chaos-at-home/ch-omd.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Basic Setup - hosts: ch-omd - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp -# - role: apt-repo/consol-labs diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index d72f13ce..a9453eee 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -85,7 +85,6 @@ network_zones: __svc_http__: 80 __svc_imap__: 143 ch-mon: 230 - ch-omd: 231 ch-router-obsd: 253 ch-router: 254 ############# diff --git a/inventory/host_vars/ch-omd.yml b/inventory/host_vars/ch-omd.yml deleted file mode 100644 index 80c6d632..00000000 --- a/inventory/host_vars/ch-omd.yml +++ /dev/null @@ -1,55 +0,0 @@ ---- -install_jumphost: ch-jump - -install: - vm: - memory: 8G - numcpus: 4 - autostart: yes - disks: - primary: /dev/sda - scsi: - sda: - type: zfs - name: root - size: 50g - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec - - name: opt - size: 10G - filesystem: ext4 - mountpoint: /opt - interfaces: - - bridge: br-svc - name: svc0 - -network: - nameservers: "{{ network_zones.svc.dns }}" - domain: "{{ host_domain }}" - systemd_link: - interfaces: "{{ install.interfaces }}" - primary: &_network_primary_ - name: svc0 - address: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) }}" - gateway: "{{ network_zones.svc.gateway }}" - static_routes: - - destination: "{{ network_zones.lan.prefix }}" - gateway: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ansible.utils.ipaddr('address') }}" - interfaces: - - *_network_primary_ diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 7266e017..710b2c9e 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -35,7 +35,6 @@ ch-installsmb host_name=installsmb ch-iot host_name=iot ch-vpn host_name=vpn ch-mon host_name=mon -ch-omd host_name=omd ch-epimetheus host_name=epimetheus ch-mclr host_name=mclr ch-mcbr host_name=mcbr @@ -388,7 +387,6 @@ ch-testvm-openwrt ch-iot ch-vpn ch-mon -ch-omd ch-k8s-ctrl ch-installsmb [vmhost-ch-prometheus] -- cgit v1.2.3