summaryrefslogtreecommitdiff
path: root/inventory
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-05-26 23:44:41 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-05-26 23:44:41 +0200
commitbb486c7e489f80e9b5a28569c18ea0d32fe3c11b (patch)
tree576360023addac147bef43f1ba340c61e3c9fe5b /inventory
parentsk-tomnext-nc: custom image for collabora code and nextcloud (diff)
cleanup old configs and playbooks
Diffstat (limited to 'inventory')
-rw-r--r--inventory/host_vars/ch-gnocchi.yml4
-rw-r--r--inventory/host_vars/r3-cccamp19-av.yml2
-rw-r--r--inventory/host_vars/r3-cccamp19-flora.yml2
-rw-r--r--inventory/host_vars/r3-cccamp19-verr.yml2
-rw-r--r--inventory/hosts.ini2
5 files changed, 9 insertions, 3 deletions
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