summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/kubernetes-cleanup.yml15
-rw-r--r--inventory/hosts.ini18
2 files changed, 16 insertions, 17 deletions
diff --git a/common/kubernetes-cleanup.yml b/common/kubernetes-cleanup.yml
index be55d11e..41678204 100644
--- a/common/kubernetes-cleanup.yml
+++ b/common/kubernetes-cleanup.yml
@@ -20,6 +20,14 @@
loop: "{{ groups['_kubernetes_nodes_remove_'] | default([]) }}"
command: "kubectl drain {{ item }} --delete-local-data --force --ignore-daemonsets"
+
+- name: remove nodes from api server
+ hosts: _kubernetes_primary_master_
+ tasks:
+ - name: remove superflous nodes
+ loop: "{{ groups['_kubernetes_nodes_remove_'] | default([]) }}"
+ command: "kubectl delete node {{ item }}"
+
- name: try to clean superflous nodes
hosts: _kubernetes_nodes_remove_
roles:
@@ -28,10 +36,3 @@
when: hostvars[groups['_kubernetes_primary_master_'][0]].kubernetes_network_plugin == 'kubeguard'
vars:
kubeguard_action: remove
-
-- name: remove node from api server
- hosts: _kubernetes_primary_master_
- tasks:
- - name: remove superflous nodes
- loop: "{{ groups['_kubernetes_nodes_remove_'] | default([]) }}"
- command: "kubectl delete node {{ item }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index e431ce43..50478195 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -1,7 +1,7 @@
[all:vars]
host_name={{ inventory_hostname }}
ansible_user=root
-ansible_port=22000
+ansible_port=222
###############################
@@ -10,7 +10,6 @@ ansible_port=22000
[chaos-at-home:vars]
host_domain=chaos-at-home.org
env_group=chaos-at-home
-ansible_port=222
[chaos-at-home]
ch-atlas host_name=atlas
@@ -82,7 +81,6 @@ r3-cccamp19-av host_name=av
[spreadspace:vars]
host_domain=spreadspace.org
env_group=spreadspace
-ansible_port=222
[spreadspace]
s2-build host_name=build
@@ -116,7 +114,6 @@ k8s-test-2019vm
[skillz:vars]
host_domain=skillz.biz
env_group=dan
-ansible_port=222
[skillz]
sk-2019 host_name=2019
@@ -154,7 +151,6 @@ ele-infobeamer-default
[elevate:vars]
host_domain=elevate.at
env_group=dan
-ansible_port=222
[elevate]
ele-media host_name=media
@@ -183,7 +179,6 @@ ele-infobeamer
[emc:vars]
host_domain=elev8.at
env_group=dan
-ansible_port=222
[emc]
emc-master
@@ -191,13 +186,16 @@ emc-master
[emc:children]
emc-dist
emc-xx
+emc-todelete
[emc-dist]
-emc-dist0
[emc-xx]
-emc-0[0:3]
+emc-00
+[emc-todelete]
+emc-dist0
+emc-0[1:3]
###############################
# host categories
@@ -286,8 +284,8 @@ ele-dolmetsch-raspi
### kubernetes cluster: emc
[k8s-emc-encoder]
-ele-dione
-ele-helene
+#ele-dione
+#ele-helene
[k8s-emc-distribution:children]
emc-dist