From 545ff968418c276cc10fedf3782ab77f36ade994 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 28 Oct 2022 20:24:10 +0200
Subject: [PATCH] Move tuned_profiles_cpu_partitioning dependency in
 overcloud-base

The tuned-profiles-cpu-partitioning package is needed by Tuned service
deployed on all roles, including Ceph. This change moves the pacakge
dependency into overcloud-base to reflect that.

Without it, images built from overcloud-ceph-storage would not deploy
successfully.

Conflicts:
	elements/overcloud-base/install.d/package-installs-overcloud-base

Change-Id: I366bf97db7e3ee82a9fb70770fdc1de0db14f963
(cherry picked from commit edbc5c3b614a9b399e399a62b7b7caf38e006fff)
(cherry picked from commit dbedc655992f200b679e6e5125c1a054a52df6ce)
---
 .../install.d/package-installs-overcloud-base |  1 +
 elements/overcloud-base/pkg-map               |  1 +
 .../package-installs-overcloud-compute        |  1 -
 elements/overcloud-compute/pkg-map            |  1 -
 .../pre-install.d/03-centos-rt                | 22 -------------------
 5 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100755 elements/overcloud-compute/pre-install.d/03-centos-rt

diff --git a/elements/overcloud-base/install.d/package-installs-overcloud-base b/elements/overcloud-base/install.d/package-installs-overcloud-base
index 0a538ede..b6a01bee 100644
--- a/elements/overcloud-base/install.d/package-installs-overcloud-base
+++ b/elements/overcloud-base/install.d/package-installs-overcloud-base
@@ -12,3 +12,4 @@ tmpwatch
 openssl-perl
 lvm2
 sysstat
+tuned_profiles_cpu_partitioning_package
diff --git a/elements/overcloud-base/pkg-map b/elements/overcloud-base/pkg-map
index ebb33c15..3051a725 100644
--- a/elements/overcloud-base/pkg-map
+++ b/elements/overcloud-base/pkg-map
@@ -11,6 +11,7 @@
     "numactl": "numactl",
     "iptables_services": "iptables-services",
     "tmpwatch": "tmpwatch",
+    "tuned_profiles_cpu_partitioning_package": "tuned-profiles-cpu-partitioning",
     "sysstat": "sysstat"
   }
 }
diff --git a/elements/overcloud-compute/install.d/package-installs-overcloud-compute b/elements/overcloud-compute/install.d/package-installs-overcloud-compute
index 436f7a3f..141dc174 100644
--- a/elements/overcloud-compute/install.d/package-installs-overcloud-compute
+++ b/elements/overcloud-compute/install.d/package-installs-overcloud-compute
@@ -4,6 +4,5 @@ nfs_package
 chrony_package
 pacemaker_remote_package
 sasl_scram_package
-tuned_profiles_cpu_partitioning_package
 ndctl_package
 linuxptp_package
diff --git a/elements/overcloud-compute/pkg-map b/elements/overcloud-compute/pkg-map
index adc12982..631ac26d 100644
--- a/elements/overcloud-compute/pkg-map
+++ b/elements/overcloud-compute/pkg-map
@@ -6,7 +6,6 @@
     "chrony_package": "chrony",
     "pacemaker_remote_package": "pacemaker-remote",
     "sasl_scram_package": "cyrus-sasl-scram",
-    "tuned_profiles_cpu_partitioning_package": "tuned-profiles-cpu-partitioning",
     "ndctl_package": "ndctl",
     "linuxptp_package": "linuxptp"
   }
diff --git a/elements/overcloud-compute/pre-install.d/03-centos-rt b/elements/overcloud-compute/pre-install.d/03-centos-rt
deleted file mode 100755
index b125c042..00000000
--- a/elements/overcloud-compute/pre-install.d/03-centos-rt
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -x
-
-if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-if [[ "$DISTRO_NAME" == *"centos7"* ]]; then
-    current_rt_repo=$(yum repolist all|grep "centos7-rt" |awk '{print $1}'| head -n 1 || true)
-    if [[ "$current_rt_repo" == "" ]]; then
-    cat << EOF > /etc/yum.repos.d/centos7-rt.repo
-[centos7-rt]
-name=CentOS 7 - Realtime
-baseurl=http://mirror.centos.org/centos/7/rt/x86_64/
-enabled=1
-gpgcheck=0
-EOF
-    else
-        yum-config-manager --enable $current_rt_repo
-    fi
-fi