Merge "Move archetypes Sonar scan to Sonarcloud"

[releng/builder.git] / packer / provision / devstack-pre-pip.yaml

diff --git a/packer/provision/devstack-pre-pip.yaml b/packer/provision/devstack-pre-pip.yaml
index b70b2bdfe12bbbaf839f2efdea1ec26859811ed3..baa339c0dc36805fe3f07a6488d2b2ec37aed651 100644 (file)
--- a/packer/provision/devstack-pre-pip.yaml
+++ b/packer/provision/devstack-pre-pip.yaml
@@ -47,6 +47,13 @@
             force: yes
           become: true
           when: rules_file_exists.stat.exists == true
+        - name: Install RDMA (InfiniBand/iWARP/RoCE) requirements
+          yum:
+            name:
+              - libibverbs
+              - libmlx5
+            state: present
+          become: true
     - name: 'Pre-Install yum and pip packages'
       block:
         - name: Create /tmp/devstack directory
@@ -65,9 +72,9 @@
           args:
             warn: False
         - name: "Install non-baseline requirements for {{ os_branch }}"
-          yum: 'name={{item}} state=present'
-          with_items:
-            - "{{ sed_output.stdout_lines }}"
+          yum:
+            name: "{{ sed_output.stdout_lines }}"
+            state: present
           become: true
         - name: git clone openstack core projects
           git: repo='https://github.com/openstack/{{ item }}.git'
@@ -126,6 +133,17 @@
           when: rdo_branch == 'rocky'
           become: true
 
+    # Workaround for git deps conflict on rocky
+    - name: Swap to git
+      block:
+        - name: Gather rpm package facts
+          package_facts:
+            manager: auto
+        - name: Replace git2u with git
+          command: yum replace -y git2u --replace-with git
+          when: ansible_facts.packages['git2u'] is defined
+      become: true
+
     - name: 'Cleanup devstack directory'
       block:
         - name: "Removing /tmp/devstack"