Ansible: fix multiple shell commands

Ansible passes "&&" as arguments to the command being called, which
prevents us from using it for calling multiple commands in one ansible
task. Fix by replacing this with "with_items".

Change-Id: Ie07a1b1969bda9569cf82ef0741ec52260e2c736
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>

diff --git a/fdio.infra.ansible/roles/intel/tasks/i40e.yaml b/fdio.infra.ansible/roles/intel/tasks/i40e.yaml
index 8c34d09..fe8ae7c 100644 (file)
--- a/fdio.infra.ansible/roles/intel/tasks/i40e.yaml
+++ b/fdio.infra.ansible/roles/intel/tasks/i40e.yaml
@@ -20,9 +20,13 @@
     - intel-inst
 
 - name: Inst - i40e Network Adapter Driver
     - intel-inst
 
 - name: Inst - i40e Network Adapter Driver

-  command: "make install && modprobe -r i40e && modprobe i40e"
+  command: "{{ item }}"

   args:
     chdir: "{{ intel_i40e_driver_dir }}/i40e-{{ intel_i40e_version }}/src"
   args:
     chdir: "{{ intel_i40e_driver_dir }}/i40e-{{ intel_i40e_version }}/src"

+  with_items:
+    - "make install"
+    - "modprobe -r i40e"
+    - "modprobe i40e"

   failed_when: no
   when:
     - intel_driver_extracted
   failed_when: no
   when:
     - intel_driver_extracted

diff --git a/fdio.infra.ansible/roles/intel/tasks/iavf.yaml b/fdio.infra.ansible/roles/intel/tasks/iavf.yaml
index 893c608..9ec6781 100644 (file)
--- a/fdio.infra.ansible/roles/intel/tasks/iavf.yaml
+++ b/fdio.infra.ansible/roles/intel/tasks/iavf.yaml
@@ -20,9 +20,13 @@
     - intel-inst
 
 - name: Inst - iavf Network Adapter Driver
     - intel-inst
 
 - name: Inst - iavf Network Adapter Driver

-  command: "make install && modprobe -r iavf && modprobe iavf"
+  command: "{{ item }}"

   args:
     chdir: "{{ intel_iavf_driver_dir }}/iavf-{{ intel_iavf_version }}/src"
   args:
     chdir: "{{ intel_iavf_driver_dir }}/iavf-{{ intel_iavf_version }}/src"

+  with_items:
+    - "make install"
+    - "modprobe -r iavf"
+    - "modprobe iavf"

   failed_when: no
   when:
     - intel_driver_extracted
   failed_when: no
   when:
     - intel_driver_extracted

diff --git a/fdio.infra.ansible/roles/intel/tasks/ice.yaml b/fdio.infra.ansible/roles/intel/tasks/ice.yaml
index e3aff34..0a2fe8a 100644 (file)
--- a/fdio.infra.ansible/roles/intel/tasks/ice.yaml
+++ b/fdio.infra.ansible/roles/intel/tasks/ice.yaml
@@ -20,9 +20,13 @@
     - intel-inst
 
 - name: Inst - ice Network Adapter Driver
     - intel-inst
 
 - name: Inst - ice Network Adapter Driver

-  command: "make install && modprobe -r ice && modprobe ice"
+  command: "{{ item }}"

   args:
     chdir: "{{ intel_ice_driver_dir }}/ice-{{ intel_ice_version }}/src"
   args:
     chdir: "{{ intel_ice_driver_dir }}/ice-{{ intel_ice_version }}/src"

+  with_items:
+    - "make install"
+    - "modprobe -r ice"
+    - "modprobe ice"

   failed_when: no
   when:
     - intel_driver_extracted
   failed_when: no
   when:
     - intel_driver_extracted