diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-12-28 10:27:23 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-12-28 10:27:23 +0100 |
| commit | 55d87ecd459ad550069cf5f5473379ae9c3a0b8e (patch) | |
| tree | 600ff74ae7330590afb87fb2b8a1909ef1022778 /inventory/host_vars | |
| parent | add signing key for next openbsd release (diff) | |
| parent | add testvm for phoebe and fix switch port configs (diff) | |
Merge branch 'topic/revamp-vmguest-roles'
Diffstat (limited to 'inventory/host_vars')
| -rw-r--r-- | inventory/host_vars/ch-router-obsd.yml | 8 | ||||
| -rw-r--r-- | inventory/host_vars/ch-sw0.yml | 10 | ||||
| -rw-r--r-- | inventory/host_vars/ch-testvm-phoebe.yml | 37 |
3 files changed, 47 insertions, 8 deletions
diff --git a/inventory/host_vars/ch-router-obsd.yml b/inventory/host_vars/ch-router-obsd.yml index cf2b7784..7827cf99 100644 --- a/inventory/host_vars/ch-router-obsd.yml +++ b/inventory/host_vars/ch-router-obsd.yml @@ -10,9 +10,8 @@ install: primary: /dev/sda virtio: vda: - type: lvm - vg: "{{ hostvars[vm_host.name].host_name }}" - lv: "{{ inventory_hostname }}" + type: zfs + name: root size: 10g interfaces: - bridge: br-svc @@ -25,5 +24,8 @@ network: name: vio0 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_ 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') }}" |