summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2021-12-23 15:41:53 +0100
committerChristian Pointner <equinox@spreadspace.org>2021-12-23 15:41:53 +0100
commitb7d535adb3a97d2a633d8fd8261b0503ef9fe5c2 (patch)
tree5c8ddd727f1082504be2178b6e4ded82ff510258
parentch-sw0 new port config (diff)
fix pheobet disk path and network config
-rw-r--r--inventory/group_vars/vmhost-ch-phoebe/vars.yml10
-rw-r--r--inventory/host_vars/ch-phoebe.yml4
-rw-r--r--inventory/host_vars/ch-sw0.yml18
3 files changed, 13 insertions, 19 deletions
diff --git a/inventory/group_vars/vmhost-ch-phoebe/vars.yml b/inventory/group_vars/vmhost-ch-phoebe/vars.yml
index 5e7bcf57..0489ef27 100644
--- a/inventory/group_vars/vmhost-ch-phoebe/vars.yml
+++ b/inventory/group_vars/vmhost-ch-phoebe/vars.yml
@@ -1,9 +1,5 @@
---
__vmhost_bridge_interface_zones__:
- eno1:
- - lan
- eno2:
- - svc
eno3:
- iot
- mgmt
@@ -18,6 +14,12 @@ __vmhost_bridge_interface_zones_yaml__: |
- {{ interface }}.{{ network_zones[zone].vlan }}
{% endfor %}
{% endfor %}
+ lan:
+ interfaces:
+ - eno1
+ svc:
+ interfaces:
+ - eno2
vm_host:
diff --git a/inventory/host_vars/ch-phoebe.yml b/inventory/host_vars/ch-phoebe.yml
index 5280c7d0..a99ff9bf 100644
--- a/inventory/host_vars/ch-phoebe.yml
+++ b/inventory/host_vars/ch-phoebe.yml
@@ -4,7 +4,7 @@ install_interface: eno1
install:
efi: true
disks:
- primary: /dev/disk/by-id/nvme-
+ primary: /dev/disk/by-id/nvme-KIOXIA-EXCERIA_SSD_31MA10GJK2N2
system_lvm:
size: 25G
@@ -18,8 +18,6 @@ network:
interfaces:
- *_network_primary_
vlans:
- eno1: "{{ __vmhost_bridge_interface_zones__['eno1'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
- eno2: "{{ __vmhost_bridge_interface_zones__['eno2'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
eno3: "{{ __vmhost_bridge_interface_zones__['eno3'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
eno4: "{{ __vmhost_bridge_interface_zones__['eno4'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
diff --git a/inventory/host_vars/ch-sw0.yml b/inventory/host_vars/ch-sw0.yml
index 90c06dba..f244c6c3 100644
--- a/inventory/host_vars/ch-sw0.yml
+++ b/inventory/host_vars/ch-sw0.yml
@@ -34,26 +34,20 @@ switch_interfaces_yaml: |
- {{ network_zones.iot.vlan }}
- spec: Gi1/0/19
- description: "phoebe-eno1"
- switchport_mode: general
- tagged_only: true
- allowed_vlans_tagged:
- - {{ network_zones.lan.vlan }}
- - spec: Gi1/0/20
description: "phoebe-eno2"
- switchport_mode: general
- tagged_only: true
- allowed_vlans_tagged:
- - {{ network_zones.svc.vlan }}
+ vlan: {{ network_zones.lan.vlan }}
+ - spec: Gi1/0/20
+ description: "phoebe-eno1"
+ vlan: {{ network_zones.svc.vlan }}
- spec: Gi1/0/21
- description: "phoebe-eno3"
+ description: "phoebe-eno4"
switchport_mode: general
tagged_only: true
allowed_vlans_tagged:
- {{ network_zones.iot.vlan }}
- {{ network_zones.mgmt.vlan }}
- spec: Gi1/0/22
- description: "phoebe-eno4"
+ description: "phoebe-eno3"
switchport_mode: general
tagged_only: true
allowed_vlans_tagged: