further cleanup host bootstraping

5 files changed, 46 insertions, 21 deletions

diff --git a/inventory/group_vars/emc-xx/main.yml b/inventory/group_vars/emc-xx/main.yml
index c73b8962..1e0dd476 100644
--- a/inventory/group_vars/emc-xx/main.yml
+++ b/inventory/group_vars/emc-xx/main.yml
@@ -1,23 +1,5 @@
 ---
+acmetool_account_email: equinox@spreadspace.org
 acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}"
 
-install:
-  cloud:
-    credentials:
-      token: "{{ vault_hcloud_api_token }}"
-  disks:
-    root_lvm_size: all
-
-network: {}
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 15G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 10G
-  fs: ext4
+install_playbook: emc-xx
diff --git a/inventory/group_vars/emc/main.yml b/inventory/group_vars/emc/main.yml
index d3b3dc12..02a2e25c 100644
--- a/inventory/group_vars/emc/main.yml
+++ b/inventory/group_vars/emc/main.yml
@@ -1,4 +1,23 @@
 ---
 zsh_banner: elevate
 
-acmetool_account_email: equinox@spreadspace.org
+install:
+  cloud:
+    credentials:
+      token: "{{ vault_hcloud_api_token }}"
+  disks:
+    root_lvm_size: all
+
+network: {}
+
+docker_lvm:
+  vg: "{{ host_name }}"
+  lv: docker
+  size: 15G
+  fs: ext4
+
+kubelet_lvm:
+  vg: "{{ host_name }}"
+  lv: kubelet
+  size: 10G
+  fs: ext4
diff --git a/inventory/group_vars/lendwirbel-live-xx/main.yml b/inventory/group_vars/lendwirbel-live-xx/main.yml
new file mode 100644
index 00000000..cf094bd1
--- /dev/null
+++ b/inventory/group_vars/lendwirbel-live-xx/main.yml
@@ -0,0 +1,5 @@
+---
+acmetool_account_email: equinox@spreadspace.org
+# acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}"
+
+install_playbook: lendwirbel-live-xx
diff --git a/inventory/group_vars/emc-dist.yml b/inventory/group_vars/lendwirbel-live/main.yml
index e53a98ad..d3df4b61 100644
--- a/inventory/group_vars/emc-dist.yml
+++ b/inventory/group_vars/lendwirbel-live/main.yml
@@ -1,4 +1,6 @@
 ---
+zsh_banner: spreadspace
+
 install:
   cloud:
     credentials:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 2be67e06..7aaf4c97 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -91,6 +91,21 @@ s2-dione host_name=dione
 s2-helene host_name=helene
 
 
+[lendwirbel-live:vars]
+host_domain=lndwrbl.live
+env_group=spreadspace
+
+[lendwirbel-live:children]
+lendwirbel-live-dist
+lendwirbel-live-xx
+
+[lendwirbel-live-dist]
+lw-live-dist0 host_name=cdn-dist0
+
+[lendwirbel-live-xx]
+lw-live-00 host_name=cdn-00
+
+
 ###############################
 # environment: dan
 
@@ -235,6 +250,8 @@ ele-lt
 [hcloud:children]
 emc-dist
 emc-xx
+lendwirbel-live-dist
+lendwirbel-live-xx
 
 [hetzner]
 emc-master