diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-03 12:00:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-03 12:00:31 +0000 |
| commit | f8e58b621244a5873115510fca7ec2f66aac4958 (patch) | |
| tree | 9e57a027aa1b1beda3789047329a3189fe5ae2b5 /extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration | |
| parent | f3fcd2425fd613af04a0feccf789a03ad09101b4 (diff) | |
| parent | 3884694d58b961e8a66f74577e173a7541b938ac (diff) | |
Merge "Add Satellite 5 support"
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 ;; |