Do not use OSP repo to build image

We need newer packages and to avoid conflicts we do not use the OSP 16
repo if present.

main-packages-list.ocp

@@ -32,7 +32,7 @@ python3-oslo-context >= 3.3.1-0.20211012152439.641a1e0.el8
 python3-oslo-db >= 9.1.0-0.20211020204148.be2cc6a.el8
 python3-oslo-i18n >= 5.1.0-0.20211012165753.b031d17.el8
 python3-oslo-log >= 4.6.0-0.20211012154701.41c8807.el8
-python3-oslo-messaging >= 12.9.1-0.20211020204149.f9de265.el8
+python3-oslo-messaging >= 12.9.1-0.20220216011954.f9de265.el8
 python3-oslo-policy >= 3.8.2-0.20211012161944.c7fd9f4.el8
 python3-oslo-serialization >= 4.2.0-0.20211012151454.2b94a4f.el8
 python3-oslo-service >= 2.6.0-0.20211012154519.091fd65.el8

prepare-efi.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euxo pipefail
+
 ARCH=$(uname -m)
 DEST=${2:-/tmp/esp.img}
 OS=${1:-centos}
@@ -18,6 +20,10 @@ else
     exit 0
 fi
 
+if dnf repolist enabled | grep -q openstack-16-for-rhel-8-rpms ; then
+  dnf config-manager --set-disabled openstack-16-for-rhel-8-rpms
+fi
+
 dnf install -y grub2 shim dosfstools mtools $PACKAGES
 
 ## TODO(TheJulia): At some point we may want to try and make the size

prepare-image.sh

@@ -6,6 +6,10 @@ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf
 # Tell RPM to skip installing documentation
 echo "tsflags=nodocs" >> /etc/dnf/dnf.conf
 
+if dnf repolist enabled | grep -q openstack-16-for-rhel-8-rpms ; then
+  dnf config-manager --set-disabled openstack-16-for-rhel-8-rpms
+fi
+
 dnf upgrade -y
 xargs -rtd'\n' dnf install -y < /tmp/${PKGS_LIST}
 if [ $(uname -m) = "x86_64" ]; then