Merge "Update cloud image CentOS7 builder x86_64"

[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..65566d3538e5a978281928e7bf6d30ab9c780f4f 100644 (file)
--- a/packer/provision/devstack-pre-pip.yaml
+++ b/packer/provision/devstack-pre-pip.yaml
@@ -9,7 +9,7 @@
     - include_role: name=lfit.system-update
 
   tasks:
-    - name: 'Install devstack dependencies'
+    - name: "Install devstack dependencies"
       block:
         - name: Install xpath dependencies
           yum:
@@ -47,7 +47,14 @@
             force: yes
           become: true
           when: rules_file_exists.stat.exists == true
-    - name: 'Pre-Install yum and pip packages'
+        - 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
           file:
@@ -58,21 +65,21 @@
           git:
             repo: https://github.com/openstack-dev/devstack.git
             dest: /tmp/devstack
-            version: '{{ os_branch }}'
+            version: "{{ os_branch }}"
         - name: "Read openstack devstack dependencies"
           shell: "sed -e 's/#.*//' /tmp/devstack/files/rpms/general"
           register: sed_output
           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'
-               dest='/tmp/devstack/{{ item }}'
-               version='{{ os_branch }}'
+            dest='/tmp/devstack/{{ item }}'
+            version='{{ os_branch }}'
           with_items:
             - requirements
             - keystone
@@ -104,21 +111,21 @@
             - horizon
           become: true
 
-    - name: 'Install openvswitch from relevant openstack branch'
+    - name: "Install openvswitch from relevant openstack branch"
       block:
-        - name: 'Install CentOS openstack release {{ rdo_branch }}'
+        - name: "Install CentOS openstack release {{ rdo_branch }}"
           yum:
-            name: 'centos-release-openstack-{{ rdo_branch }}'
+            name: "centos-release-openstack-{{ rdo_branch }}"
             state: present
           become: true
-        - name: 'Install openvswitch 2.8.2 for stable/queens'
+        - name: "Install openvswitch 2.8.2 for stable/queens"
           yum:
             name: openvswitch-2.8.2-1.el7
             state: present
             disable_gpg_check: yes
           when: rdo_branch == 'queens'
           become: true
-        - name: 'Install openvswitch latest for stable/rocky'
+        - name: "Install openvswitch latest for stable/rocky"
           yum:
             name: openvswitch
             state: present
@@ -126,7 +133,18 @@
           when: rdo_branch == 'rocky'
           become: true
 
-    - name: 'Cleanup devstack directory'
+    # 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"
           file: