From fce5d94e021a948efc420d8f41a1ac3a97359e86 Mon Sep 17 00:00:00 2001
From: Sandeep Yadav <sandyada@redhat.com>
Date: Wed, 19 Jan 2022 12:27:44 +0530
Subject: [PATCH] Update overcloud-base element pkg-map

With this patch, we are removing yum_plugin_priorities_package and
python_ipaddr from overcloud-base element as a part of refactoring
to only support centos/rhel 8/9.

This repo have stable branches, so train builds should be using
stable/train of tripleo-puppet-elements.

Change-Id: Ica02244aedf4f4192f8aedfab82e41fdbca47e77
---
 .../install.d/package-installs-overcloud-base |  1 -
 elements/overcloud-base/pkg-map               | 20 -------------------
 .../pre-install.d/01-install-yum-priorities   |  7 -------
 3 files changed, 28 deletions(-)
 delete mode 100755 elements/overcloud-base/pre-install.d/01-install-yum-priorities

diff --git a/elements/overcloud-base/install.d/package-installs-overcloud-base b/elements/overcloud-base/install.d/package-installs-overcloud-base
index 9e5e0e2b..0a538ede 100644
--- a/elements/overcloud-base/install.d/package-installs-overcloud-base
+++ b/elements/overcloud-base/install.d/package-installs-overcloud-base
@@ -4,7 +4,6 @@ crudini
 gdisk
 podman
 libreswan
-python_ipaddr
 openstack_selinux
 net_snmp
 numactl
diff --git a/elements/overcloud-base/pkg-map b/elements/overcloud-base/pkg-map
index 8f771f60..ebb33c15 100644
--- a/elements/overcloud-base/pkg-map
+++ b/elements/overcloud-base/pkg-map
@@ -1,22 +1,4 @@
 {
-  "release": {
-    "rhel": {
-      "8": {
-        "yum_plugin_priorities_package": "",
-        "python_ipaddr": ""
-      }
-    },
-    "centos": {
-      "8": {
-        "yum_plugin_priorities_package": "",
-        "python_ipaddr": ""
-      },
-      "9": {
-        "yum_plugin_priorities_package": "",
-        "python_ipaddr": ""
-      }
-    }
-  },
   "default": {
     "aide": "aide",
     "ansible_pacemaker": "ansible-pacemaker",
@@ -24,11 +6,9 @@
     "gdisk": "gdisk",
     "podman": "podman",
     "libreswan": "libreswan",
-    "python_ipaddr": "python-ipaddr",
     "openstack_selinux": "openstack-selinux",
     "net_snmp": "net-snmp",
     "numactl": "numactl",
-    "yum_plugin_priorities_package": "yum-plugin-priorities",
     "iptables_services": "iptables-services",
     "tmpwatch": "tmpwatch",
     "sysstat": "sysstat"
diff --git a/elements/overcloud-base/pre-install.d/01-install-yum-priorities b/elements/overcloud-base/pre-install.d/01-install-yum-priorities
deleted file mode 100755
index b475a8da..00000000
--- a/elements/overcloud-base/pre-install.d/01-install-yum-priorities
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-set -o xtrace
-
-if [[ "$DISTRO_NAME" == "centos7" || "$DISTRO_NAME" == "fedora" ]]; then
-  install-packages -m overcloud-base yum_plugin_priorities_package
-fi