From 3884694d58b961e8a66f74577e173a7541b938ac Mon Sep 17 00:00:00 2001 From: James Slagle Date: Tue, 12 Jan 2016 17:34:22 -0500 Subject: 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 --- extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration | 2 ++ 1 file changed, 2 insertions(+) (limited to 'extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration') 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 ;; -- cgit 1.2.3-korg