Infra: Minor ansible tweaks

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I47de0b78ed64b2426d39c5edf22ec36866609e8e

diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile
index 6dddad6..936de52 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile
+++ b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile
@@ -84,8 +84,6 @@ RUN apt-get -q update \
         sshpass \
  && curl -L https://packagecloud.io/fdio/master/gpgkey | sudo apt-key add - \
  && curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | sudo bash \
         sshpass \
  && curl -L https://packagecloud.io/fdio/master/gpgkey | sudo apt-key add - \
  && curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | sudo bash \

- # temp hack due to build.sh
- && apt-get install -y -qq vpp-ext-deps \

  && curl -fsSL https://get.docker.com | sh \
  && rm -rf /var/lib/apt/lists/*
 
  && curl -fsSL https://get.docker.com | sh \
  && rm -rf /var/lib/apt/lists/*
 

diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
index feef2ca..e9cdd0d 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
@@ -17,19 +17,6 @@
   tags:
     - perf-inst-prerequisites
 
   tags:
     - perf-inst-prerequisites
 

-- name: Conf - Kernel Parameters
-  lineinfile:
-    path: "/etc/default/grub"
-    state: "present"
-    regexp: "^GRUB_CMDLINE_LINUX="
-    line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value is sameas true %}{{key}} {% else %}{{key}}={{value}} {% endif %}{% endfor %}\""
-  notify:
-    - "Update GRUB"
-  tags:
-    - perf-conf-grub
-
-- meta: flush_handlers
-

 - name: Conf - Turbo Boost
   import_tasks: turbo_boost.yaml
   when: >
 - name: Conf - Turbo Boost
   import_tasks: turbo_boost.yaml
   when: >


@@ -164,8 +151,6 @@
     owner: "root"
     group: "root"
     mode: 0644
     owner: "root"
     group: "root"
     mode: 0644

-  notify:
-    - "Update GRUB"

   tags:
     - perf-conf-irqbalance
 
   tags:
     - perf-conf-irqbalance
 


@@ -176,6 +161,19 @@
   tags:
     - perf-conf-ondemand
 
   tags:
     - perf-conf-ondemand
 

+- name: Conf - Kernel Parameters
+  lineinfile:
+    path: "/etc/default/grub"
+    state: "present"
+    regexp: "^GRUB_CMDLINE_LINUX="
+    line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value is sameas true %}{{key}} {% else %}{{key}}={{value}} {% endif %}{% endfor %}\""
+  notify:
+    - "Update GRUB"
+  tags:
+    - perf-conf-grub
+
+- meta: flush_handlers
+

 - name: Conf - Load Kernel Modules By Default
   lineinfile:
     path: "/etc/modules"
 - name: Conf - Load Kernel Modules By Default
   lineinfile:
     path: "/etc/modules"


@@ -183,7 +181,9 @@
     line: "{{ item }}"
   with_items:
     - "vfio-pci"
     line: "{{ item }}"
   with_items:
     - "vfio-pci"

+  notify:
+    - "Reboot Server"

   tags:
     - perf-conf-load-kernel-modules
 
   tags:
     - perf-conf-load-kernel-modules
 

-- meta: flush_handlers
+- meta: flush_handlers
\ No newline at end of file