openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Don't disable satellite repo after registration"

This commit is contained in:
Jenkins 2017-04-06 12:44:21 +00:00 committed by Gerrit Code Review
parent cd6128d0a5 551baca688
commit 161b2b4427
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
View File

@ -240,7 +240,6 @@ case "${REG_METHOD:-}" in
retry subscription-manager $repos
retry yum install -y katello-agent || true # needed for errata reporting to satellite6
katello-package-upload
retry subscription-manager repos --disable ${satellite_repo}
else
pushd /usr/share/rhn/
curl --retry ${retry_max_count} --retry-delay 10 --max-time 30 -k -O $REG_SAT_URL/pub/RHN-ORG-TRUSTED-SSL-CERT

6
releasenotes/notes/leave-satellite-repo-enabled-8b60528bd5450c7b.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Previously the RHEL registration script disabled the satellite repo after
installing the necessary packages from it. This makes it awkward to
update those packages later, so the repo will no longer be disabled.