diff --git a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration b/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration index 306e2427..b977bcd0 100755 --- a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration +++ b/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration @@ -23,7 +23,7 @@ REG_METHOD="$(os-apply-config --key rh_registration.method --type raw --key-defa opts= attach_opts= repos="repos --enable rhel-7-server-rpms" -satellite_repo="rhel-7-server-rh-common-beta-rpms" +satellite_repo="rhel-7-server-rh-common-rpms" if [ -n "${REG_AUTO_ATTACH:-}" ]; then opts="$opts --auto-attach" @@ -115,7 +115,6 @@ case "${REG_METHOD:-}" in subscription-manager $repos yum install -y katello-agent || true # needed for errata reporting to satellite6 katello-package-upload - # beta-rpms repo only needed to support the katello-ca rpm above. subscription-manager repos --disable ${satellite_repo} ;; disable) diff --git a/elements/rhel-common/pre-install.d/00-rhel-registration b/elements/rhel-common/pre-install.d/00-rhel-registration index e3e8a805..bd30cfc6 100755 --- a/elements/rhel-common/pre-install.d/00-rhel-registration +++ b/elements/rhel-common/pre-install.d/00-rhel-registration @@ -5,7 +5,7 @@ set -o pipefail opts= attach_opts= repos="repos --enable rhel-7-server-rpms" -satellite_repo="rhel-7-server-rh-common-beta-rpms" +satellite_repo="rhel-7-server-rh-common-rpms" if [ -n "${REG_AUTO_ATTACH:-}" ]; then opts="$opts --auto-attach" @@ -94,8 +94,7 @@ case "${REG_METHOD:-}" in rpm -Uvh "$REG_SAT_URL/pub/katello-ca-consumer-latest.noarch.rpm" || true subscription-manager register $opts subscription-manager $repos - # beta-rpms repo only needed to support the katello-ca rpm above. - subscription-manager repos --disable rhel-7-server-rh-common-beta-rpms + subscription-manager repos --disable ${satellite_repo} ;; disable) echo "Disabling RHEL registration"