From 9e65cdc6451715b57bf1d08993c8977090a2f43a Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 21 Aug 2019 19:03:58 +0200
Subject: nicer grouping for r3 @ cccamp

---
 ansible.cfg                                  |  3 +++
 inventory/group_vars/r3-cccamp19/network.yml | 29 ++++++++++++++++++++++++++++
 inventory/group_vars/realraum/network.yml    | 26 -------------------------
 inventory/host_vars/r3-cccamp19-flora.yml    | 11 +++++++----
 inventory/hosts.ini                          | 12 +++++++++++-
 5 files changed, 50 insertions(+), 31 deletions(-)
 create mode 100644 inventory/group_vars/r3-cccamp19/network.yml
 delete mode 100644 inventory/group_vars/realraum/network.yml

diff --git a/ansible.cfg b/ansible.cfg
index 97646bde..ae27edfa 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -24,6 +24,9 @@ bin_ansible_callbacks = True
 
 interpreter_python = auto_silent
 
+## https://github.com/ansible/ansible/issues/56930
+force_valid_group_names = ignore
+
 [ssh_connection]
 pipelining = True
 ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s
diff --git a/inventory/group_vars/r3-cccamp19/network.yml b/inventory/group_vars/r3-cccamp19/network.yml
new file mode 100644
index 00000000..07b869e3
--- /dev/null
+++ b/inventory/group_vars/r3-cccamp19/network.yml
@@ -0,0 +1,29 @@
+---
+network_zones:
+  camp19:
+    vlan: 19
+
+  lan:
+    vlan: 126
+    prefix: 192.168.126.0/24
+    gw: 192.168.126.254
+    dns:
+      - 192.168.126.254
+    dhcp:
+      start: 1
+      limit: 199
+    offsets:
+      dione: 200
+      helene: 201
+      r3-cccamp19-flora: 220
+      r3-cccamp19-gw: 254
+
+  mgmt:
+    vlan: 41
+    prefix: 192.168.41.0/24
+    offsets:
+      dione: 100
+      helene: 101
+      r3-cccamp19-sw0: 200
+      r3-cccamp19-sw1: 201
+      r3-cccamp19-gw: 254
diff --git a/inventory/group_vars/realraum/network.yml b/inventory/group_vars/realraum/network.yml
deleted file mode 100644
index 5a6b4e7e..00000000
--- a/inventory/group_vars/realraum/network.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-network_zones:
-  camp19:
-    vlan: 19
-
-  lan:
-    vlan: 126
-    prefix: 192.168.126.0/24
-    offsets:
-      dione: 200
-      helene: 201
-      r3-cccamp19-flora: 220
-      r3-cccamp19-gw: 254
-    dhcp:
-      start: 1
-      limit: 199
-
-  mgmt:
-    vlan: 41
-    prefix: 192.168.41.0/24
-    offsets:
-      dione: 100
-      helene: 101
-      r3-cccamp19-sw0: 200
-      r3-cccamp19-sw1: 201
-      r3-cccamp19-gw: 254
diff --git a/inventory/host_vars/r3-cccamp19-flora.yml b/inventory/host_vars/r3-cccamp19-flora.yml
index f637fd69..bb4b9c02 100644
--- a/inventory/host_vars/r3-cccamp19-flora.yml
+++ b/inventory/host_vars/r3-cccamp19-flora.yml
@@ -1,6 +1,5 @@
 ---
 vm_host: helene
-install_dhcp: true
 
 install:
   host: "{{ vm_host }}"
@@ -14,15 +13,19 @@ install:
         lv: "{{ inventory_hostname }}"
         size: 10g
   interfaces:
-  - bridge: camp19-br
-    name: camp0
   - bridge: lan-br
     name: lan0
+  - bridge: camp19-br
+    name: camp0
   autostart: True
 
 network:
+  nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
   systemd_link:
     interfaces: "{{ install.interfaces }}"
   primary:
-    interface: camp0
+    interface: lan0
+    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+    gateway: "{{ network_zones.lan.gw }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index b4219f0b..0caacaf8 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -56,8 +56,18 @@ ansible_port=22000
 
 [realraum]
 r3-vex2 host_name=vex2
+
+[realraum:children]
+r3-cccamp19
+
+[r3-cccamp19:vars]
+host_domain=camp.realraum.at
+ansible_port=222
+
+[r3-cccamp19]
 r3-cccamp19-sw0 ansible_host=192.168.41.200 ansible_port=22
-r3-cccamp19-flora host_name=flora host_domain=camp.realraum.at
+r3-cccamp19-flora host_name=flora
+
 
 ###############################
 # environment: spreadspace
-- 
cgit v1.2.3