X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fflannel%2Ftasks%2Fmain.yaml;h=03c577563c59f85f86003fb2562e6e3ab454aa24;hb=HEAD;hp=0a3fd339ef6e0e4f6fbac99423d0928fc971452a;hpb=8e53059aed6a7fdde34149893f05552aca3ed89a;p=ta%2Fcaas-danm.git

diff --git a/ansible/roles/flannel/tasks/main.yaml b/ansible/roles/flannel/tasks/main.yaml
index 0a3fd33..03c5775 100644
--- a/ansible/roles/flannel/tasks/main.yaml
+++ b/ansible/roles/flannel/tasks/main.yaml
@@ -1,18 +1,22 @@
 ---
 # Copyright 2019 Nokia
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: collect flannel interfaces
+  set_fact:
+    flannel_interfaces: "{{ hostvars.values() | json_query(interface_query) | unique | list }}"
+
 - name: template Flannel DaemonSet file
   template:
     src: flannel-ds.yaml
@@ -33,19 +37,12 @@
     manifest: "{{ caas.manifests_directory }}/flannel-ds.yaml"
     state: present
 
-- name: template DanmNet file for Flannel network for kube-system namespace
+- name: template default ClusterNetwork for kube-system namespace
   template:
-    src: flannel_dnet.yaml
-    dest: "{{ caas.manifests_directory }}/flannel-danm_net_kube_system_ns.yaml"
-
-- name: wait for DanmNet to be available
-  command: "kubectl api-resources"
-  register: kube_api_resources
-  until: kube_api_resources.stdout | search('danmnets')
-  retries: 10
-  delay: 1
+    src: flannel_cnet.yaml.j2
+    dest: "{{ caas.manifests_directory }}/flannel-cnet.yaml"
 
-- name: create Flannel DanmNet within kube-system namespace
+- name: create ClusterNetwork within kube-system namespace
   kubectl:
-    manifest: "{{ caas.manifests_directory }}/flannel-danm_net_kube_system_ns.yaml"
+    manifest: "{{ caas.manifests_directory }}/flannel-cnet.yaml"
     state: present