From b24e23e1a105d320b997452d31f5d9d0b7e66469 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 24 Sep 2023 13:22:09 +0200
Subject: [PATCH] Update inventory
---
roles/kvm/{ => default}/tasks/main.yml | 0
teckids.yaml | 62 ++++++++++++++++----------
2 files changed, 38 insertions(+), 24 deletions(-)
rename roles/kvm/{ => default}/tasks/main.yml (100%)
diff --git a/roles/kvm/tasks/main.yml b/roles/kvm/default/tasks/main.yml
similarity index 100%
rename from roles/kvm/tasks/main.yml
rename to roles/kvm/default/tasks/main.yml
diff --git a/teckids.yaml b/teckids.yaml
index 3d2bd51..26dfc1e 100644
--- a/teckids.yaml
+++ b/teckids.yaml
@@ -4,7 +4,7 @@ all:
cloud.teckids.org:
commu-intern.teckids.org:
commu.teckids.org:
- db-0[1-5].teckids.org:
+ db-0[1:5].teckids.org:
discourse01.teckids.org:
gitlab01.teckids.org:
jabber01.teckids.org:
@@ -16,40 +16,54 @@ all:
rz-sp-virt-0[1:5].teckids.org:
worker[1:10].kube.teckids.org:
children:
- vm:
+ kvm:
+ hosts:
+ rz-sp-virt-0[1:5].teckids.org:
children:
rz-sp-virt-01:
hosts:
- rz-sp-fw-01.teckids.org:
- master-1.kube.teckids.org:
- worker-[1:2].kube.teckids.org:
- db-01.teckids.org:
+ rz-sp-virt-01.teckids.org:
+ guests:
+ - rz-sp-fw-01.teckids.org
+ - master-1.kube.teckids.org
+ - worker-1.kube.teckids.org
+ - worker-2.kube.teckids.org
+ - db-01.teckids.org
rz-sp-virt-02:
hosts:
- rz-sp-fw-02.teckids.org:
- master-2.kube.teckids.org:
- worker-[3:4].kube.teckids.org:
- db-02.teckids.org:
+ rz-sp-virt-02.teckids.org:
+ guests:
+ - rz-sp-fw-02.teckids.org
+ - master-2.kube.teckids.org
+ - worker-3.kube.teckids.org
+ - worker-4.kube.teckids.org
+ - db-02.teckids.org
rz-sp-virt-03:
hosts:
- rz-sp-fw-03.teckids.org:
- master-3.kube.teckids.org:
- worker-[5:6].kube.teckids.org:
- db-03.teckids.org:
+ rz-sp-virt-03.teckids.org:
+ guests:
+ - rz-sp-fw-03.teckids.org:
+ - master-3.kube.teckids.org:
+ - worker-5.kube.teckids.org:
+ - worker-6.kube.teckids.org:
+ - db-03.teckids.org:
rz-sp-virt-04:
hosts:
- rz-sp-fw-04.teckids.org:
- worker-[7:8].kube.teckids.org:
- db-04.teckids.org:
+ rz-sp-virt-04.teckids.org:
+ guests:
+ - rz-sp-fw-04.teckids.org
+ - worker-7.kube.teckids.org
+ - worker-8.kube.teckids.org
+ - db-04.teckids.org
rz-sp-virt-05:
hosts:
- rz-sp-fw-05.teckids.org:
- rz-sp-backup-01.teckids.org:
- worker-[9:10].kube.teckids.org:
- db-05.teckids.org:
- kvm:
- hosts:
- rz-sp-virt-0[1:5].teckids.org:
+ rz-sp-virt-05.teckids.org:
+ guests:
+ - rz-sp-fw-05.teckids.org:
+ - rz-sp-backup-01.teckids.org:
+ - worker-9.kube.teckids.org:
+ - worker-10.kube.teckids.org:
+ - db-05.teckids.org:
backup:
hosts:
rz-sp-backup-01.teckids.org:
--
GitLab