diff options
| author |   James Slagle <jslagle@redhat.com> | 2016-01-12 17:34:22 -0500 |
|---|---|---|
| committer | James Slagle <jslagle@redhat.com> | 2016-02-29 14:23:36 -0500 |
| commit | 3884694d58b961e8a66f74577e173a7541b938ac (patch) | |
| tree | ee84ab592229d7026a52e477f18269f37b86fcbf /extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration | |
| parent | 31b05b17bfd028d16990231079c4bfde777cde40 (diff) | |
Add Satellite 5 support
Add Satellite 5 support to the RHEL registration environment and
resources. The registration script is updated to support both satellite
versions in place given the similarity of the options for both
scenarios.
The satellite version is detected based on $REG_SAT_URL, and that
determines whether subscription-manager or rhnreg_ks is used.
Change-Id: Ic261c8a16a7d6d3978f8bfc6e53f75dbe1b716db
Diffstat (limited to 'extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration')
| -rw-r--r-- | extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration index 1e72e0a6..916f97e3 100644 --- a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration +++ b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration @@ -7,6 +7,8 @@ case "${REG_METHOD:-}" in portal|satellite) # Allow unregistration to fail. # We don't want to fail stack deletes if unregistration fails. + # Note that this will be a no-op on satellite 5, which doesn't support + # unregistering from the cli. subscription-manager unregister || true subscription-manager clean || true ;; |