summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-07-08 03:27:21 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-07-11 02:29:02 +0200
commite12f1667ed37c60290b21df355e2960fcad3ecc7 (patch)
tree500b566c658b5100e33c7e6e37494a0d263c368a
parentvm/host/network: config initial setup works now (diff)
test new vm/host/network on other machines...
-rw-r--r--inventory/host_vars/ch-gnocchi.yml4
-rw-r--r--roles/vm/host/network/tasks/main.yml31
2 files changed, 21 insertions, 14 deletions
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/roles/vm/host/network/tasks/main.yml b/roles/vm/host/network/tasks/main.yml
index e7668917..cd415d1e 100644
--- a/roles/vm/host/network/tasks/main.yml
+++ b/roles/vm/host/network/tasks/main.yml
@@ -1,20 +1,23 @@
---
-- name: install ifenslave package
- when: "'bonds' in network"
- apt:
- name: ifenslave
- state: present
+- name: configure bonds and vlans
+ when: "'bonds' in network or 'vlans' in network"
+ block:
+ - name: install ifenslave package
+ when: "'bonds' in network"
+ apt:
+ name: ifenslave
+ state: present
-- name: install vlan package
- when: "'vlans' in network"
- apt:
- name: vlan
- state: present
+ - name: install vlan package
+ when: "'vlans' in network"
+ apt:
+ name: vlan
+ state: present
-- name: create network interfaces
- template:
- src: interfaces.j2
- dest: /etc/network/interfaces
+ - name: create network interfaces
+ template:
+ src: interfaces.j2
+ dest: /etc/network/interfaces
- name: create network bridges
when: "'bridges' in vm_host.network"