diff options
| -rw-r--r-- | chaos-at-home/r3-cccamp19-dione.yml | 7 | ||||
| -rw-r--r-- | chaos-at-home/r3-cccamp19-flora.yml | 8 | ||||
| -rw-r--r-- | chaos-at-home/r3-cccamp19-helene.yml | 7 | ||||
| -rw-r--r-- | chaos-at-home/r3-cccamp19-verr.yml | 8 | ||||
| -rw-r--r-- | chaos-at-home/r3-cccamp19_vm.yml (renamed from chaos-at-home/r3-cccamp19-av.yml) | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ch-gnocchi.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/r3-cccamp19-av.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/r3-cccamp19-flora.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/r3-cccamp19-verr.yml | 2 | ||||
| -rw-r--r-- | inventory/hosts.ini | 2 | ||||
| -rw-r--r-- | spreadspace/s2-build.yml | 5 |
11 files changed, 15 insertions, 34 deletions
diff --git a/chaos-at-home/r3-cccamp19-dione.yml b/chaos-at-home/r3-cccamp19-dione.yml deleted file mode 100644 index 6a4933a1..00000000 --- a/chaos-at-home/r3-cccamp19-dione.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Basic Setup - hosts: r3-cccamp19-dione - roles: - - role: base - - role: sshd - - role: zsh diff --git a/chaos-at-home/r3-cccamp19-flora.yml b/chaos-at-home/r3-cccamp19-flora.yml deleted file mode 100644 index 0208c1db..00000000 --- a/chaos-at-home/r3-cccamp19-flora.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Basic Setup - hosts: r3-cccamp19-flora - roles: - - role: base - - role: sshd - - role: zsh - - role: dyndns/client diff --git a/chaos-at-home/r3-cccamp19-helene.yml b/chaos-at-home/r3-cccamp19-helene.yml deleted file mode 100644 index 35344505..00000000 --- a/chaos-at-home/r3-cccamp19-helene.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Basic Setup - hosts: r3-cccamp19-helene - roles: - - role: base - - role: sshd - - role: zsh diff --git a/chaos-at-home/r3-cccamp19-verr.yml b/chaos-at-home/r3-cccamp19-verr.yml deleted file mode 100644 index 187d76ad..00000000 --- a/chaos-at-home/r3-cccamp19-verr.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Basic Setup - hosts: r3-cccamp19-verr - roles: - - role: base - - role: sshd - - role: zsh - - role: dyndns/client diff --git a/chaos-at-home/r3-cccamp19-av.yml b/chaos-at-home/r3-cccamp19_vm.yml index 511776de..ca8d230b 100644 --- a/chaos-at-home/r3-cccamp19-av.yml +++ b/chaos-at-home/r3-cccamp19_vm.yml @@ -1,6 +1,6 @@ --- - name: Basic Setup - hosts: r3-cccamp19-av + hosts: "{{ install_hostname }}" roles: - role: base - role: sshd diff --git a/inventory/host_vars/ch-gnocchi.yml b/inventory/host_vars/ch-gnocchi.yml index 35527e2d..d5525443 100644 --- a/inventory/host_vars/ch-gnocchi.yml +++ b/inventory/host_vars/ch-gnocchi.yml @@ -33,7 +33,7 @@ __interface_zones__: __interface_zones_yaml__: | - {% for interface in __interface_zones__.keys() %} + {% for interface in (__interface_zones__.keys() | sort) %} {% for zone in __interface_zones__[interface] %} {% if zone is mapping %} {{ zone.name }}: @@ -61,7 +61,7 @@ __interface_configs__: | # The loopback network interface auto lo iface lo inet loopback - {% for interface in __interface_zones__.keys() %} + {% for interface in (__interface_zones__.keys() | sort) %} auto {{ interface }} diff --git a/inventory/host_vars/r3-cccamp19-av.yml b/inventory/host_vars/r3-cccamp19-av.yml index 378f459c..54f6c5da 100644 --- a/inventory/host_vars/r3-cccamp19-av.yml +++ b/inventory/host_vars/r3-cccamp19-av.yml @@ -31,5 +31,7 @@ network: mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}" gateway: "{{ network_zones.lan.gateway }}" +install_playbook: r3-cccamp19_vm + dyndns: server: ch-pan diff --git a/inventory/host_vars/r3-cccamp19-flora.yml b/inventory/host_vars/r3-cccamp19-flora.yml index 378f459c..54f6c5da 100644 --- a/inventory/host_vars/r3-cccamp19-flora.yml +++ b/inventory/host_vars/r3-cccamp19-flora.yml @@ -31,5 +31,7 @@ network: mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}" gateway: "{{ network_zones.lan.gateway }}" +install_playbook: r3-cccamp19_vm + dyndns: server: ch-pan diff --git a/inventory/host_vars/r3-cccamp19-verr.yml b/inventory/host_vars/r3-cccamp19-verr.yml index 03b32e4c..81cbe05b 100644 --- a/inventory/host_vars/r3-cccamp19-verr.yml +++ b/inventory/host_vars/r3-cccamp19-verr.yml @@ -31,5 +31,7 @@ network: mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}" gateway: "{{ network_zones.lan.gateway }}" +install_playbook: r3-cccamp19_vm + dyndns: server: ch-pan diff --git a/inventory/hosts.ini b/inventory/hosts.ini index edc73ac1..2e55d5dd 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -15,9 +15,9 @@ env_group=chaos-at-home ch-equinox-ws host_name=equinox-ws ch-atlas host_name=atlas ch-pan host_name=pan -ch-mimas host_name=mimas ch-keyserver host_name=keyserver ch-testvm host_name=testvm +ch-mimas host_name=mimas ch-mimas2 host_name=mimas ch-gnocchi host_name=gnocchi ch-router host_name=router diff --git a/spreadspace/s2-build.yml b/spreadspace/s2-build.yml new file mode 100644 index 00000000..0fc9de6e --- /dev/null +++ b/spreadspace/s2-build.yml @@ -0,0 +1,5 @@ +--- +- name: Basic Setup + hosts: s2-build + roles: + - role: zsh |