From 25a978d8ce30bdbb62a0a82443501a4f0d2d6cc2 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 11 Jan 2020 03:03:17 +0100
Subject: kuberntes: base installation works now

---
 common/kubernetes.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'common/kubernetes.yml')

diff --git a/common/kubernetes.yml b/common/kubernetes.yml
index 45d7cc5d..96b39e5a 100644
--- a/common/kubernetes.yml
+++ b/common/kubernetes.yml
@@ -48,7 +48,7 @@
   run_once: yes
   tasks:
   - name: sanity checks for kubeguard
-    when: kubernetes.network_plugin == 'kubeguard'
+    when: kubernetes_network_plugin == 'kubeguard'
     block:
     - name: check whether every node has a node_index assigned
       assert:
@@ -66,7 +66,7 @@
         that: (kubeguard.node_index.values() | min) > 0
 
   - name: make sure the kubernetes_cri_socket variable is configured correctly
-    when: kubernetes.container_runtime == 'containerd'
+    when: kubernetes_container_runtime == 'containerd'
     assert:
       msg: "The variable kubernetes_cri_socket is not configured correctly for use with containerd!"
       that:
@@ -78,9 +78,9 @@
   hosts: _kubernetes_nodes_
   roles:
   - role: kubernetes/net/kubeguard
-    when: kubernetes.network_plugin == 'kubeguard'
-  # - role: kubernetes/base
-  # - role: kubernetes/kubeadm/base
+    when: kubernetes_network_plugin == 'kubeguard'
+  - role: kubernetes/base
+  - role: kubernetes/kubeadm/base
 
 # - name: configure kubernetes primary master
 #   hosts: _kubernetes_primary_master_
@@ -126,7 +126,7 @@
 #   roles:
 #   - role: kubernetes/kubeadm/reset
 #   - role: kubernetes/net/kubeguard
-#     when: kubernetes.network_plugin == 'kubeguard'
+#     when: kubernetes_network_plugin == 'kubeguard'
 #     vars:
 #       kubeguard_action: remove
 
-- 
cgit v1.2.3