Merge pull request #85 from Diaoul/patch-1

Fix check nodes ready without flannel
PyratLabs · Jan 23, 2021 · 3716774 · 3716774
2 parents e954ba1 + 1b4d3dd
commit 3716774
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/molecule/nodeploy/k3s_server.yml b/molecule/nodeploy/k3s_server.yml
@@ -1,6 +1,6 @@
 ---
 
-flannel-backend: 'host-gw'
+flannel-backend: 'none'
 disable-scheduler: true
 disable-cloud-controller: true
 disable-network-policy: true

diff --git a/tasks/validate/state/nodes.yml b/tasks/validate/state/nodes.yml
@@ -11,7 +11,7 @@
   retries: 30
   delay: 20
   when: k3s_control_node
-        and (("disable" not in k3s_runtime_config)
-            or ("disable" in k3s_runtime_config and "flannel" not in k3s_runtime_config.disable))
+        and ("flannel-backend" not in k3s_runtime_config
+            or k3s_runtime_config["flannel-backend"] != "none")
         and not ansible_check_mode
   become: "{{ k3s_become_for_kubectl | ternary(true, false, k3s_become_for_all) }}"