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 commitedbc5c3b61) (cherry picked from commitdbedc65599)
This commit is contained in:
committed by
Takashi Kajinami
parent
082a9aa620
commit
545ff96841
@@ -12,3 +12,4 @@ tmpwatch
|
||||
openssl-perl
|
||||
lvm2
|
||||
sysstat
|
||||
tuned_profiles_cpu_partitioning_package
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
"numactl": "numactl",
|
||||
"iptables_services": "iptables-services",
|
||||
"tmpwatch": "tmpwatch",
|
||||
"tuned_profiles_cpu_partitioning_package": "tuned-profiles-cpu-partitioning",
|
||||
"sysstat": "sysstat"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,5 @@ nfs_package
|
||||
chrony_package
|
||||
pacemaker_remote_package
|
||||
sasl_scram_package
|
||||
tuned_profiles_cpu_partitioning_package
|
||||
ndctl_package
|
||||
linuxptp_package
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user