diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-07-11 02:58:28 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-07-11 02:58:28 +0200 |
commit | 49c58d575f420165f7d8341bccb8b4ba4629e735 (patch) | |
tree | dfbfe6a937ec04fa7d48de8c1d08a1596ba837b2 /inventory/host_vars | |
parent | Merge branch 'topic/debian-installer-verification' (diff) | |
parent | ch-gnocchi: remove temporary interface config (diff) |
Merge branch 'topic/vm-host-network'
Diffstat (limited to 'inventory/host_vars')
-rw-r--r-- | inventory/host_vars/ch-atlas.yml | 3 | ||||
-rw-r--r-- | inventory/host_vars/ch-gnocchi.yml | 4 | ||||
-rw-r--r-- | inventory/host_vars/ch-oulu.yml | 19 |
3 files changed, 25 insertions, 1 deletions
diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml index aa2c2e0c..120e007d 100644 --- a/inventory/host_vars/ch-atlas.yml +++ b/inventory/host_vars/ch-atlas.yml @@ -9,3 +9,6 @@ network: # address6: "{{ vm_host.network.bridges.public.prefix6 | ipaddr(vm_host.network.bridges.public.offsets6[inventory_hostname]) | ipaddr('address/prefix') }}" address6: "{{ vm_host.network.bridges.public.prefix6 | ipaddr(41) | ipaddr('address/prefix') }}" gateway6: "{{ vm_host.network.bridges.public.gateway6 }}" + vlans: + eth0: + - 502 diff --git a/inventory/host_vars/ch-gnocchi.yml b/inventory/host_vars/ch-gnocchi.yml index c52a1cf4..ff27a081 100644 --- a/inventory/host_vars/ch-gnocchi.yml +++ b/inventory/host_vars/ch-gnocchi.yml @@ -13,6 +13,10 @@ network: 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: diff --git a/inventory/host_vars/ch-oulu.yml b/inventory/host_vars/ch-oulu.yml index e63e6f2d..f6ef0e4c 100644 --- a/inventory/host_vars/ch-oulu.yml +++ b/inventory/host_vars/ch-oulu.yml @@ -1,4 +1,6 @@ --- +install_interface: eno1 + install: efi: true disks: @@ -16,8 +18,23 @@ network: - 9.9.9.9 domain: "{{ host_domain }}" primary: &_network_primary_ - name: eno1 + name: br-lan address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ + bonds: + - name: bond0 + mode: 802.3ad + slaves: + - eno1 + - eno2 + options: + miimon: 100 + vlans: + bond0: "{{ __vmhost_bridge_interface_zones__['bond0'] | map('extract', network_zones) | map(attribute='vlan') | list }}" + +apt_repo_components: + - main + - contrib + - non-free ## for microcode updates |