diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-06 12:44:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-06 12:44:21 +0000 |
| commit | 161b2b4427f7db0cf65d209a3f63804de9724107 (patch) | |
| tree | 9bccd34d4319a91449e376a18ecf2ba727b561ce | |
| parent | cd6128d0a54989926709f42b7be80bf5daba2f8f (diff) | |
| parent | 551baca688449f6f7f798577229cae39abbe6107 (diff) | |
Merge "Don't disable satellite repo after registration"
| -rw-r--r-- | extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration | 1 | ||||
| -rw-r--r-- | releasenotes/notes/leave-satellite-repo-enabled-8b60528bd5450c7b.yaml | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration index 0d0fa3f1..d14ed73f 100644 --- a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration +++ b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration @@ -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 diff --git a/releasenotes/notes/leave-satellite-repo-enabled-8b60528bd5450c7b.yaml b/releasenotes/notes/leave-satellite-repo-enabled-8b60528bd5450c7b.yaml new file mode 100644 index 00000000..c327265a --- /dev/null +++ b/releasenotes/notes/leave-satellite-repo-enabled-8b60528bd5450c7b.yaml @@ -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. |