diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-06-22 02:37:11 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-06-22 02:37:11 +0200 |
commit | 5a35c210ddb64998586b69b921e8d721395f09d5 (patch) | |
tree | 9a65e26f147c59ab379e1cd23a1baf60ac5d5264 /chaos-at-home | |
parent | Merge branch 'topic/kubernetes-network-plugins' (diff) | |
parent | converted other physical machines to new network config (diff) |
Merge branch 'topic/network-interfaces-variables-refactoring'
Diffstat (limited to 'chaos-at-home')
-rw-r--r-- | chaos-at-home/ch-gnocchi.yml | 22 | ||||
-rw-r--r-- | chaos-at-home/host_vars/r3-cccamp19-sw0.yml | 9 | ||||
-rw-r--r-- | chaos-at-home/r3-cccamp19-gw.yml | 5 | ||||
-rw-r--r-- | chaos-at-home/r3-cccamp19-sw0.yml | 8 | ||||
-rw-r--r-- | chaos-at-home/r3-cccamp19_vm.yml | 9 | ||||
-rw-r--r-- | chaos-at-home/r3-vex2.yml | 7 | ||||
-rw-r--r-- | chaos-at-home/vm-install.yml | 3 |
7 files changed, 23 insertions, 40 deletions
diff --git a/chaos-at-home/ch-gnocchi.yml b/chaos-at-home/ch-gnocchi.yml index c3811c50..fd519bfd 100644 --- a/chaos-at-home/ch-gnocchi.yml +++ b/chaos-at-home/ch-gnocchi.yml @@ -15,4 +15,24 @@ - name: install network interface config copy: dest: /etc/network/interfaces - content: "{{ __interface_configs__ }}" + content: | + # This file describes the network interfaces available on your system + # and how to activate them. For more information, see interfaces(5). + + # The loopback network interface + auto lo + iface lo inet loopback + {% for interface in (__vmhost_bridge_interface_zones__.keys() | sort) %} + + + auto {{ interface }} + iface {{ interface }} inet manual + {% for zone in __vmhost_bridge_interface_zones__[interface] %} + + auto {{ interface }}.{{ network_zones[zone].vlan }} + iface {{ interface }}.{{ network_zones[zone].vlan }} inet manual + {% endfor %} + {% endfor %} + + + source /etc/network/interfaces.d/* diff --git a/chaos-at-home/host_vars/r3-cccamp19-sw0.yml b/chaos-at-home/host_vars/r3-cccamp19-sw0.yml deleted file mode 100644 index 9a0e7782..00000000 --- a/chaos-at-home/host_vars/r3-cccamp19-sw0.yml +++ /dev/null @@ -1,9 +0,0 @@ -$ANSIBLE_VAULT;1.2;AES256;chaos-at-home -36323334643335666630393439363962363665633161333563336237376532303137336431336665 -3430313039653331633563393033393637633164616462310a366162373163353561363864306465 -30343433653738663735383532336535396231613162303232656139663562633238383765666233 -3434616261623131310a343236333230363866666331663665373566383938383136316536323435 -62313238303564666230393333353630326464316631376238366635616238613232366466383035 -63636562616437356432323731613632653636363031643165666339633363353934633262643466 -64363839343230393863643532613365393033333731653830363061663135663533636332353162 -36336233376561613338 diff --git a/chaos-at-home/r3-cccamp19-gw.yml b/chaos-at-home/r3-cccamp19-gw.yml deleted file mode 100644 index e92370ac..00000000 --- a/chaos-at-home/r3-cccamp19-gw.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: configure dyndns - hosts: r3-cccamp19-gw - roles: - - role: dyndns/client diff --git a/chaos-at-home/r3-cccamp19-sw0.yml b/chaos-at-home/r3-cccamp19-sw0.yml deleted file mode 100644 index 36ee99f5..00000000 --- a/chaos-at-home/r3-cccamp19-sw0.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: bootstrap - hosts: r3-cccamp19-sw0 - gather_facts: no - roles: - - role: dellos6/bootstrap - - role: dellos6/base - - role: dellos6/layer2 diff --git a/chaos-at-home/r3-cccamp19_vm.yml b/chaos-at-home/r3-cccamp19_vm.yml deleted file mode 100644 index fa4ffb77..00000000 --- a/chaos-at-home/r3-cccamp19_vm.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: "{{ install_hostname }}" - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd - - role: core/zsh - - role: dyndns/client diff --git a/chaos-at-home/r3-vex2.yml b/chaos-at-home/r3-vex2.yml deleted file mode 100644 index 4efac0a8..00000000 --- a/chaos-at-home/r3-vex2.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: nothing to see here - hosts: r3-vex2 - tasks: - - name: do nothing - debug: - msg: "all the rest is done using the realraum ansible repo" diff --git a/chaos-at-home/vm-install.yml b/chaos-at-home/vm-install.yml index cf19d046..b6a69b67 100644 --- a/chaos-at-home/vm-install.yml +++ b/chaos-at-home/vm-install.yml @@ -6,9 +6,10 @@ - set_fact: install_cooked: "{{ install }}" network_cooked: "{{ network }}" + vm_host_cooked: "{{ vm_host }}" - name: cook variables for host - hosts: "{{ hostvars[install_hostname].install.vm.host }}" + hosts: "{{ hostvars[install_hostname].vm_host.name }}" gather_facts: no tasks: - set_fact: |