feat(ansible): Calico bits

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: I0dcef89b81bda11b4389c97332868827a2a0be5b

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
index c63e7b1..83ba4aa 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
@@ -34,6 +34,7 @@ intel_800_matrix: "dpdk24.07"
 intel_dsa_matrix: true
 intel_qat_matrix: true
 
+calico_sut: true
 docker_sut: true
 docker_volumes:
   - source: "/dev/null"

diff --git a/fdio.infra.ansible/roles/calico/defaults/main.yaml b/fdio.infra.ansible/roles/calico/defaults/main.yaml
index 5519986..f05e105 100644 (file)
--- a/fdio.infra.ansible/roles/calico/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/calico/defaults/main.yaml
@@ -10,5 +10,4 @@ kubernetes_calico_resources:
   - https://raw.githubusercontent.com/projectcalico/calico/v{{ kubernetes_calico_version }}/manifests/tigera-operator.yaml
   - https://raw.githubusercontent.com/projectcalico/calico/v{{ kubernetes_calico_version }}/manifests/operator-crds.yaml
 
-
 calico_vpp_state: "present"
\ No newline at end of file

diff --git a/fdio.infra.ansible/roles/calico/tasks/main.yaml b/fdio.infra.ansible/roles/calico/tasks/main.yaml
index 147fac1..3ec5fb3 100644 (file)
--- a/fdio.infra.ansible/roles/calico/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/calico/tasks/main.yaml
@@ -9,6 +9,8 @@
   loop:
     - "operator-crds.yaml"
     - "tigera-operator.yaml"
+  when: >
+    calico_sut is defined
   tags:
     - kubernetes-calico-install
 
@@ -19,6 +21,8 @@
   loop:
     - "operator-crds.yaml"
     - "tigera-operator.yaml"
+  when: >
+    calico_sut is defined
   tags:
     - kubernetes-calico-install
 
@@ -26,5 +30,42 @@
   kubernetes.core.k8s:
     state: "{{ calico_vpp_state }}"
     template: "calico-vpp.yaml.j2"
+  when: >
+    calico_sut is defined
   tags:
     - kubernetes-calico-install
+
+- name: get a list of all pods from any namespace
+  kubernetes.core.k8s_info:
+    kind: Pod
+    field_selectors:
+      - status.phase=Running
+    label_selectors:
+      - k8s-app=calico-vpp-node
+  register: pod_list
+  tags:
+    - kubernetes-info
+
+- name: register vpp pod name
+  ansible.builtin.set_fact:
+    calico_pod_name: "{{ item[0]['metadata']['name'] }}"
+  loop:
+    - "{{ pod_list['resources'] }}"
+  tags:
+    - kubernetes-info
+
+- name: execute command on calico-vpp-pod
+  kubernetes.core.k8s_exec:
+    namespace: calico-vpp-dataplane
+    pod: "{{ calico_pod_name }}"
+    container: vpp
+    command: vppctl sh version
+  register: command_status
+  when: >
+    calico_pod_name is defined
+  tags:
+    - kubernetes-info
+
+- name: Check last command status
+  debug:
+    msg: "{{ command_status.stdout }}"
\ No newline at end of file

diff --git a/fdio.infra.ansible/roles/calico/templates/calico-vpp.yaml.j2 b/fdio.infra.ansible/roles/calico/templates/calico-vpp.yaml.j2
index 7e05c15..c09a85f 100644 (file)
--- a/fdio.infra.ansible/roles/calico/templates/calico-vpp.yaml.j2
+++ b/fdio.infra.ansible/roles/calico/templates/calico-vpp.yaml.j2
@@ -154,7 +154,7 @@ data:
     }
     plugins {
         plugin default { enable }
-        plugin dpdk_plugin.so { enable }
+        plugin dpdk_plugin.so { disable }
         plugin calico_plugin.so { enable }
         plugin ping_plugin.so { disable }
         plugin dispatch_trace_plugin.so { enable }
@@ -181,13 +181,13 @@ data:
       "uplinkInterfaces": [
         {
           "interfaceName": "enp56s0np0",
-          "vppDriver": "dpdk",
+          "vppDriver": "avf",
           "rx": 8,
           "rxMode": "polling"
         },
         {
           "interfaceName": "enp58s0np0",
-          "vppDriver": "dpdk",
+          "vppDriver": "avf",
           "rx": 8,
           "rxMode": "polling"
         }

diff --git a/fdio.infra.ansible/sut.yaml b/fdio.infra.ansible/sut.yaml
index fb6397b..36a4d52 100644 (file)
--- a/fdio.infra.ansible/sut.yaml
+++ b/fdio.infra.ansible/sut.yaml
@@ -24,8 +24,8 @@
       tags: docker
     - role: kubernetes
       tags: kubernetes
-    #- role: calico
-    #  tags: calico
+    - role: calico
+      tags: calico
     - role: vpp
       tags: vpp
     - role: dpdk