Configure `caas_oam` as flannel interface

[ta/caas-danm.git] / ansible / roles / flannel / tasks / main.yaml

diff --git a/ansible/roles/flannel/tasks/main.yaml b/ansible/roles/flannel/tasks/main.yaml
index c97645b..03c5775 100644 (file)
--- a/ansible/roles/flannel/tasks/main.yaml
+++ b/ansible/roles/flannel/tasks/main.yaml
@@ -13,6 +13,10 @@
 # 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,12 +37,12 @@
     manifest: "{{ caas.manifests_directory }}/flannel-ds.yaml"
     state: present
 
-- name: template default TenantNetwork for kube-system namespace
+- name: template default ClusterNetwork for kube-system namespace
   template:
-    src: flannel_tnet.yaml.j2
-    dest: "{{ caas.manifests_directory }}/flannel-tnet_kube_system_ns.yaml"
+    src: flannel_cnet.yaml.j2
+    dest: "{{ caas.manifests_directory }}/flannel-cnet.yaml"
 
-- name: create TenantNetwork within kube-system namespace
+- name: create ClusterNetwork within kube-system namespace
   kubectl:
-    manifest: "{{ caas.manifests_directory }}/flannel-tnet_kube_system_ns.yaml"
+    manifest: "{{ caas.manifests_directory }}/flannel-cnet.yaml"
     state: present