From 07bcf8e86e0e11f0d2928e3451e151695f84b9a8 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 27 Dec 2021 22:15:33 +0100 Subject: add testvm for phoebe and fix switch port configs --- inventory/group_vars/chaos-at-home/network.yml | 2 ++ inventory/host_vars/ch-sw0.yml | 10 +++---- inventory/host_vars/ch-testvm-phoebe.yml | 37 ++++++++++++++++++++++++++ inventory/hosts.ini | 2 ++ 4 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 inventory/host_vars/ch-testvm-phoebe.yml (limited to 'inventory') diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index ac46f005..2832ec59 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -47,6 +47,7 @@ network_zones: ch-sensors0: 10 ch-sensors1: 11 ch-sensors2: 12 + ch-testvm-phoebe: 43 ch-mon: 230 ch-iot: 254 @@ -68,6 +69,7 @@ network_zones: ch-gw-lan: 28 ch-iot: 30 ch-testvm-prometheus: 42 + ch-testvm-phoebe: 43 ch-nic: 53 __svc_http__: 80 __svc_imap__: 143 diff --git a/inventory/host_vars/ch-sw0.yml b/inventory/host_vars/ch-sw0.yml index f244c6c3..c914d3c4 100644 --- a/inventory/host_vars/ch-sw0.yml +++ b/inventory/host_vars/ch-sw0.yml @@ -35,23 +35,23 @@ switch_interfaces_yaml: | - spec: Gi1/0/19 description: "phoebe-eno2" - vlan: {{ network_zones.lan.vlan }} + vlan: {{ network_zones.svc.vlan }} - spec: Gi1/0/20 description: "phoebe-eno1" - vlan: {{ network_zones.svc.vlan }} + vlan: {{ network_zones.lan.vlan }} - spec: Gi1/0/21 description: "phoebe-eno4" switchport_mode: general tagged_only: true allowed_vlans_tagged: - - {{ network_zones.iot.vlan }} - - {{ network_zones.mgmt.vlan }} + - {{ network_zones.magenta.vlan }} - spec: Gi1/0/22 description: "phoebe-eno3" switchport_mode: general tagged_only: true allowed_vlans_tagged: - - {{ network_zones.magenta.vlan }} + - {{ network_zones.iot.vlan }} + - {{ network_zones.mgmt.vlan }} - spec: Gi1/0/23 vlan: {{ network_zones.svc.vlan }} diff --git a/inventory/host_vars/ch-testvm-phoebe.yml b/inventory/host_vars/ch-testvm-phoebe.yml new file mode 100644 index 00000000..880b4e06 --- /dev/null +++ b/inventory/host_vars/ch-testvm-phoebe.yml @@ -0,0 +1,37 @@ +--- +install_jumphost: ch-jump + +install: + vm: + memory: 1G + numcpus: 1 + autostart: False + disks: + primary: /dev/sda + scsi: + sda: + type: zfs + name: root + size: 15g + interfaces: + - bridge: br-svc + name: svc0 + - bridge: br-iot + name: iot0 + +network: + nameservers: "{{ network_zones.svc.dns }}" + domain: "{{ host_domain }}" + systemd_link: + interfaces: "{{ install.interfaces }}" + primary: &_network_primary_ + name: svc0 + address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + gateway: "{{ network_zones.svc.gateway }}" + static_routes: + - destination: "{{ network_zones.lan.prefix }}" + gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}" + interfaces: + - *_network_primary_ + - name: iot0 + address: "{{ network_zones.iot.prefix | ipaddr(network_zones.iot.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index a159aaf3..6b54c33a 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -15,6 +15,7 @@ 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-router host_name=router ch-router-obsd host_name=router ch-gw-lan host_name=gw-lan @@ -334,6 +335,7 @@ ch-gnocchi vmhost-ch-gnocchi-guests [vmhost-ch-phoebe-guests] +ch-testvm-phoebe #ch-router ch-router-obsd #ch-jump -- cgit v1.2.3