X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Fvpp_device%2Ftasks%2Fmain.yaml;h=33b551715ff3e63ccdb6fb115bd48cb078649a01;hb=fc9d16842e1a5aa7191bfa012fc42932bbaabc2a;hp=46ca1d746bd7f3b350ba009dde9d26661dd5dfcd;hpb=46efda9bd3a32cfe9944cb421ae3e2a3978bf9fc;p=csit.git

diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
index 46ca1d746b..33b551715f 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
@@ -1,68 +1,92 @@
 ---
 # file: roles/vpp_device/tasks/main.yaml
 
-- name: Load vfio-pci by default
+- name: VPP_device - Load Kernel Modules By Default
   lineinfile:
-    path: '/etc/modules'
-    state: 'present'
-    line: 'vfio-pci'
-  tags: load-vfio-pci
+    path: "/etc/modules"
+    state: "present"
+    line: "{{ item }}"
+  with_items:
+    - "vfio-pci"
+  tags:
+    - load-kernel-modules
 
-- name: Copy csit-initialize-vfs.sh
+- name: VPP_device - Disable ipv6 router advertisement
+  sysctl:
+    name: "net.ipv6.conf.default.accept_ra"
+    value: "0"
+    state: "present"
+    sysctl_file: "/etc/sysctl.d/90-csit.conf"
+    reload: "yes"
+  tags:
+    - set-sysctl
+
+- name: VPP_device - Disable ipv6 router advertisement
+  sysctl:
+    name: "net.ipv6.conf.all.accept_ra"
+    value: "0"
+    state: "present"
+    sysctl_file: "/etc/sysctl.d/90-csit.conf"
+    reload: "yes"
+  tags:
+    - set-sysctl
+
+- name: VPP_device - Copy csit-initialize-vfs.sh
   copy:
-   src: 'files/csit-initialize-vfs.sh'
-   dest: '/usr/local/bin/'
-   owner: 'root'
-   group: 'root'
-   mode: '744'
-  tags: copy-vf-script
+   src: "files/csit-initialize-vfs.sh"
+   dest: "/usr/local/bin/"
+   owner: "root"
+   group: "root"
+   mode: "744"
+  tags:
+    - copy-vf-script
 
-- name: Copy csit-initialize-vfs-data.sh
+- name: VPP_device - Copy csit-initialize-vfs-data.sh
   copy:
-   src: 'files/{{ vfs_data_file }}'
-   dest: '/usr/local/bin/csit-initialize-vfs-data.sh'
-   owner: 'root'
-   group: 'root'
-   mode: '744'
+   src: "files/{{ vfs_data_file }}"
+   dest: "/usr/local/bin/csit-initialize-vfs-data.sh"
+   owner: "root"
+   group: "root"
+   mode: "744"
   tags: copy-vf-data-script
-  when: vfs_data_file is defined
+  when:
+    - vfs_data_file is defined
 
-- name: Copy default csit-initialize-vfs-data.sh
+- name: VPP_device - Copy default csit-initialize-vfs-data.sh
   copy:
-   src: 'files/csit-initialize-vfs-default.sh'
-   dest: '/usr/local/bin/csit-initialize-vfs-data.sh'
-   owner: 'root'
-   group: 'root'
-   mode: '744'
+   src: "files/csit-initialize-vfs-default.sh"
+   dest: "/usr/local/bin/csit-initialize-vfs-data.sh"
+   owner: "root"
+   group: "root"
+   mode: "744"
   tags: copy-vf-data-script
-  when: vfs_data_file is not defined
+  when:
+    - vfs_data_file is not defined
 
-- name: Start csit-initialize-vfs.service
+- name: VPP_device - Start csit-initialize-vfs.service
   copy:
-   src: 'files/csit-initialize-vfs.service'
-   dest: '/etc/systemd/system/'
-   owner: 'root'
-   group: 'root'
-   mode: '644'
+   src: "files/csit-initialize-vfs.service"
+   dest: "/etc/systemd/system/"
+   owner: "root"
+   group: "root"
+   mode: "644"
   notify:
-    - 'Start csit-initialize-vfs.service'
-  tags: start-vf-service
+    - "Start csit-initialize-vfs.service"
+  tags:
+    - start-vf-service
 
 - meta: flush_handlers
 
-- name: Set hugepages in GRUB
+- name: VPP_device - Set hugepages in GRUB
   lineinfile:
-    path: '/etc/default/grub'
-    state: 'present'
-    regexp: '^GRUB_CMDLINE_LINUX='
-    line: 'GRUB_CMDLINE_LINUX="hugepagesz=2M hugepages={{ grub.nr_hugepages }}"'
+    path: "/etc/default/grub"
+    state: "present"
+    regexp: "^GRUB_CMDLINE_LINUX="
+    line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value %}{{key}}={{value}} {% else %}{{key}} {% endif %}{% endfor %}\""
   notify:
-    - 'Update GRUB'
-    - 'Reboot server'
-  tags: set-grub
+    - "Update GRUB"
+    - "Reboot server"
+  tags:
+    - set-grub
 
 - meta: flush_handlers
-
-- name: Kernel VM install
-  include_tasks: '../../common/tasks/kernel_install.yaml'
-  tags: install-kernel-image