sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix Satellite Repo"

Browse Source
This commit is contained in:
Jenkins 2015-01-20 17:55:59 +00:00 committed by Gerrit Code Review
commit 1162a3abe1
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
View File

@ -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)

5
elements/rhel-common/pre-install.d/00-rhel-registration
View File

@ -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"