revamp installer playbooks and add ch-apps vm

4 files changed, 45 insertions, 8 deletions

diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index b21074ff..769c6291 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -43,9 +43,10 @@ network_zones:
 #      - 192.168.32.254
       - 9.9.9.9
     offsets:
+      ch-stats: 10
       ch-jump: 22
       ch-gw-lan: 28
-      ch-stats: 10
+      ch-apps: 32
       ch-nic: 53
       ch-web: 80
       ch-mail: 143
diff --git a/inventory/host_vars/ch-apps.yml b/inventory/host_vars/ch-apps.yml
new file mode 100644
index 00000000..1f2e02bc
--- /dev/null
+++ b/inventory/host_vars/ch-apps.yml
@@ -0,0 +1,33 @@
+---
+install_jumphost: ch-jump
+
+install:
+  vm:
+    memory: 8G
+    numcpus: 6
+    autostart: True
+  disks:
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: zfs
+        name: root
+        size: 10g
+  interfaces:
+  - bridge: br-svc
+    name: svc0
+
+network:
+  nameservers: "{{ network_zones.svc.dns }}"
+  domain: "{{ host_domain }}"
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary: &_network_primary_
+    name: svc0
+    address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.svc.gateway }}"
+    static_routes:
+    - destination: "{{ network_zones.lan.prefix }}"
+      gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}"
+  interfaces:
+  - *_network_primary_
diff --git a/inventory/host_vars/ch-nic.yml b/inventory/host_vars/ch-nic.yml
index 60c68f57..4a323853 100644
--- a/inventory/host_vars/ch-nic.yml
+++ b/inventory/host_vars/ch-nic.yml
@@ -1,4 +1,6 @@
 ---
+install_jumphost: ch-jump
+
 install:
   vm:
     memory: 768M
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 0e1431bf..7bc1ae64 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -14,20 +14,21 @@ host_domain=chaos-at-home.org
 env_group=chaos-at-home
 
 [chaos-at-home]
+ch-gnocchi host_name=gnocchi
+ch-router host_name=router
+ch-router-obsd host_name=router
+ch-gw-lan host_name=gw-lan
+ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump
+ch-nic host_name=nic
 ch-equinox-ws host_name=equinox-ws
 ch-prometheus host_name=prometheus
+ch-apps host_name=apps
 ch-atlas host_name=atlas
 ch-pan host_name=pan
 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
-ch-router-obsd host_name=router
-ch-gw-lan host_name=gw-lan
-ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump
-ch-nic host_name=nic
 ch-oulu host_name=oulu host_domain=helsinki.at
 ch-oulu-vm1 host_name=oulu-vm1 host_domain=helsinki.at
 
@@ -257,7 +258,7 @@ ch-gnocchi
 vmhost-ch-gnocchi-guests
 
 [vmhost-ch-prometheus-guests]
-ch-dummy
+ch-apps
 [vmhost-ch-prometheus]
 ch-prometheus
 [vmhost-ch-prometheus:children]