re-order definitions for k8s

Change-Id: I3b29a9c35bf44caee798a8edd26d99e489371786 Closes-Bug: #1770154
Juniper · May 28, 2018 · 3783406 · 3783406
1 parent eb47614
commit 3783406
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/playbooks/roles/install_contrail/tasks/create_kubemanager.yml b/playbooks/roles/install_contrail/tasks/create_kubemanager.yml
@@ -21,11 +21,6 @@
     path: "/etc/contrail/common_kubemanager.env"
     state: touch
 
-- name: "create contrail_configuration.KUBERNETES_API_SERVER"
-  set_fact:
-    contrail_configuration: "{{ contrail_configuration|default({})|combine({'KUBERNETES_API_SERVER': master}) }}"
-  when: master is defined and roles[instance_name].kubemanager.KUBERNETES_API_SERVER is undefined
-
 - name: "populate global common_kubemanager.env"
   lineinfile: dest=/etc/contrail/common_kubemanager.env regexp='^{{ item.key }}=.*' line="{{ item.key }}={{ item.value }}" state=present
   with_dict: "{{ contrail_configuration }}"

diff --git a/playbooks/roles/install_contrail/tasks/main.yml b/playbooks/roles/install_contrail/tasks/main.yml
@@ -257,6 +257,35 @@
     - { name: 'imageManager_ip', is_not_defined : "{{ contrail_configuration.imageManager_ip is not defined }}" }
     - { name: 'networkManager_ip', is_not_defined : "{{ contrail_configuration.networkManager_ip is not defined }}" }
 
+- name: init master list
+  set_fact:
+    master_list: []
+  tags:
+    - k8s
+
+- name: init master inventory list
+  set_fact:
+    master_inventory_list: []
+  tags:
+    - k8s
+
+- name: set master
+  include: set_master.yml
+  with_items:
+    - "{{ k8s_master_nodes_list }}"
+  loop_control:
+    loop_var: controller_item
+  when: roles[instance_name].k8s_master is defined or roles[instance_name].k8s_node is defined or roles[instance_name].kubemanager is defined
+  tags:
+    - k8s
+
+- name: "create contrail_configuration.KUBERNETES_API_SERVER for nodes"
+  set_fact:
+    contrail_configuration: "{{ contrail_configuration | combine({'KUBERNETES_API_SERVER': master}) }}"
+  when:
+    - contrail_configuration.KUBERNETES_API_SERVER is undefined
+    - master is defined
+
 - name: create /var/log/contrail
   file:
     path: /var/log/contrail
@@ -352,28 +381,6 @@
   tags:
     - analytics
 
-- name: init master list
-  set_fact:
-    master_list: []
-  tags:
-    - k8s
-
-- name: init master inventory list
-  set_fact:
-    master_inventory_list: []
-  tags:
-    - k8s
-
-- name: set master
-  include: set_master.yml
-  with_items:
-    - "{{ k8s_master_nodes_list }}"
-  loop_control:
-    loop_var: controller_item
-  when: roles[instance_name].k8s_master is defined or roles[instance_name].k8s_node is defined or roles[instance_name].kubemanager is defined
-  tags:
-    - k8s
-
 - name: create cni
   include: create_k8s_cni.yml
   when: roles[instance_name].k8s_node is defined