summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaos-at-home/k8s-test-master.yml (renamed from spreadspace/emc-test.yml)2
-rw-r--r--chaos-at-home/k8s-test.yml18
-rw-r--r--inventory/group_vars/k8s-emc/main.yml1
-rw-r--r--inventory/host_vars/k8s-test-master.yml (renamed from inventory/host_vars/emc-test.yml)0
-rw-r--r--inventory/host_vars/sk2016.yml2
-rw-r--r--inventory/hosts.ini29
6 files changed, 46 insertions, 6 deletions
diff --git a/spreadspace/emc-test.yml b/chaos-at-home/k8s-test-master.yml
index 12f2859f..e309d871 100644
--- a/spreadspace/emc-test.yml
+++ b/chaos-at-home/k8s-test-master.yml
@@ -1,6 +1,6 @@
---
- name: Basic Setup
- hosts: emc-test
+ hosts: k8s-test-master
roles:
- role: base
- role: sshd
diff --git a/chaos-at-home/k8s-test.yml b/chaos-at-home/k8s-test.yml
new file mode 100644
index 00000000..a78ffa73
--- /dev/null
+++ b/chaos-at-home/k8s-test.yml
@@ -0,0 +1,18 @@
+---
+- name: prepare hetzner hosts
+ hosts: k8s-test:&hetzner
+ roles:
+ - role: hetzner-slim
+
+- name: prepare hetzner hosts
+ hosts: k8s-test:&scaleway
+ roles:
+ - role: scaleway-slim
+
+- name: Basic Setup
+ hosts: k8s-test
+ roles:
+ - role: base
+ - role: sshd
+ - role: zsh
+ - role: admin-user
diff --git a/inventory/group_vars/k8s-emc/main.yml b/inventory/group_vars/k8s-emc/main.yml
index 6b1344ae..cf6c5e77 100644
--- a/inventory/group_vars/k8s-emc/main.yml
+++ b/inventory/group_vars/k8s-emc/main.yml
@@ -24,7 +24,6 @@ kubernetes:
emc-04: 4
emc-05: 5
emc-06: 6
- emc-test: 99
emc-00: 100
dione: 101
helene: 102
diff --git a/inventory/host_vars/emc-test.yml b/inventory/host_vars/k8s-test-master.yml
index 9b556df0..9b556df0 100644
--- a/inventory/host_vars/emc-test.yml
+++ b/inventory/host_vars/k8s-test-master.yml
diff --git a/inventory/host_vars/sk2016.yml b/inventory/host_vars/sk2016.yml
index d6bd5ae5..27daf133 100644
--- a/inventory/host_vars/sk2016.yml
+++ b/inventory/host_vars/sk2016.yml
@@ -17,4 +17,4 @@ vm_host:
- 213.133.99.99
indices:
emc-stats: 200
- emc-test: 201
+ k8s-test-master: 201
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 0e83ecda..1a3bc966 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -19,6 +19,15 @@ atlas
keyserver
+[k8s-test:vars]
+env_group=chaos-at-home
+
+[k8s-test]
+k8s-test-master
+k8s-test0
+k8s-test1
+
+
###############################
# environment: spreadspace
@@ -43,7 +52,6 @@ env_group=spreadspace
[emc]
emc-stats
emc-master
-emc-test
[emc:children]
emc-xx
@@ -87,16 +95,17 @@ sk2013
sk2016
emc-stats
emc-master
+k8s-test0
[hetzner:children]
emc-xx
[scaleway-kernel]
-# emc-test
+k8s-test1
[scaleway]
-emc-test
+k8s-test1
[scaleway:children]
scaleway-kernel
@@ -122,3 +131,17 @@ k8s-emc-master
k8s-emc-encoder
k8s-emc-streamer
k8s-emc-stats
+
+
+
+### kubernetes cluster: chaos
+
+[k8s-chaos-master]
+k8s-test-master
+
+[k8s-chaos-nodes]
+k8s-test[1:2]
+
+[k8s-chaos:children]
+k8s-chaos-master
+k8s-chaos-nodes