From 0c341f582025c90b6231bf94c2bacb32c39b3b4d Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Mon, 21 Sep 2020 10:35:07 +0530 Subject: [PATCH] Revert "Avoid disabling rhel-7-server-rh-common-rpms" Originally it was added for missing python-cheetah dep for openstack-nova. Nova has removed usage of it long ago with [1]. rhel-7-server-rh-common-rpms should be disabled once it's usage is over as it packages from it can conflict with other openstack repos. If some package which is needed by OpenStack Packages is missing then instead of adding rhel-7-server-rh-common-rpms repo consideration should be to add it in RDO. [1] https://review.opendev.org/#/c/40205 This reverts commit c7219a5a605e68f0ca46f4f1c130b602e25be073. Change-Id: Iad3a1c353c10bb35f9c9ef4076b65f5c84b803b2 --- .../elements/rhel-common/pre-install.d/00-rhel-registration | 2 ++ 1 file changed, 2 insertions(+) diff --git a/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration b/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration index ff98c610..841a8ee4 100755 --- a/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration +++ b/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration @@ -125,6 +125,8 @@ case "${REG_METHOD:-}" in subscription-manager repos --disable=\* echo "Enabling repos: $user_repos" subscription-manager $repos + echo "Disabling satellite repo because it is no longer needed" + subscription-manager repos --disable ${satellite_repo} ;; disable) echo "Disabling RHEL registration"