Strip git2u packages from devstack rocky

CSIT tests with devstack rocky tries to pull in git dependencies
which conflicts with existing git2u rpms. As a workaround
uninstall them on the devstack rocky image since its not
required.

Change-Id: Ib4f2797c83ded9d19d4d391bbde28cadfdd1f3a6
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/packer/provision/devstack-pre-pip.yaml b/packer/provision/devstack-pre-pip.yaml
index 930b7bc96500d92d31fb4061e319f875df8d9fc8..baa339c0dc36805fe3f07a6488d2b2ec37aed651 100644 (file)
--- a/packer/provision/devstack-pre-pip.yaml
+++ b/packer/provision/devstack-pre-pip.yaml
@@ -133,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"