Move credentials pre-check

2018-03-31 03:24:57 +03:00 · 2018-03-31 03:24:57 +03:00 · ab8760cc83
commit ab8760cc83
parent b6da596ec1
2 changed files with 8 additions and 8 deletions
--- a/roles/kubernetes/node/tasks/main.yml
+++ b/roles/kubernetes/node/tasks/main.yml
@ -134,6 +134,14 @@
  tags:
    - kube-proxy

+- include_tasks: "{{ cloud_provider }}-credential-check.yml"
+  when:
+    - cloud_provider is defined
+    - cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
+  tags:
+    - cloud-provider
+    - facts
+
 - name: Write cloud-config
  template:
    src: "{{ cloud_provider }}-cloud-config.j2"
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@ -71,14 +71,6 @@
    - cloud-provider
    - facts

- include_tasks: "{{ cloud_provider }}-credential-check.yml"
-  when:
-    - cloud_provider is defined
-    - cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
-  tags:
-    - cloud-provider
-    - facts
-
 - name: Create cni directories
  file:
    path: "{{ item }}"