Skip to content

Commit

Permalink
[PR #9578/bcc92e8a backport][stable-10] redhat_subscription: stop man…
Browse files Browse the repository at this point in the history
…ual unsubscribing on unregistration (#9590)

redhat_subscription: stop manual unsubscribing on unregistration (#9578)

Unregistering a system also drops all the resources for it
automatically, so there is no need to manually unsubscribing (which
actually means removing all the subscriptions).

In addition to that, newer versions of subscription-manager drop all the
support for entitlements, so the "remove" subcommand (used by
unsubscribe()) does not exist anymore, and thus the unregistration fails
with those versions.

This fixes the registration on EL 10 systems, and Fedora 41 and greater.

(cherry picked from commit bcc92e8)

Co-authored-by: Pino Toscano <[email protected]>
  • Loading branch information
patchback[bot] and ptoscano authored Jan 20, 2025
1 parent 4476a4b commit add595e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
bugfixes:
- |
redhat_subscription - do not try to unsubscribe (i.e. remove subscriptions)
when unregistering a system: newer versions of subscription-manager, as
available in EL 10 and Fedora 41+, do not support entitlements anymore, and
thus unsubscribing will fail
(https://github.com/ansible-collections/community.general/pull/9578).
1 change: 0 additions & 1 deletion plugins/modules/redhat_subscription.py
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,6 @@ def main():
module.exit_json(changed=False, msg="System already unregistered.")
else:
try:
rhsm.unsubscribe()
rhsm.unregister()
except Exception as e:
module.fail_json(msg="Failed to unregister: %s" % to_native(e))
Expand Down
5 changes: 0 additions & 5 deletions tests/unit/plugins/modules/test_redhat_subscription.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,6 @@ def test_without_required_parameters_registered(mocker, capfd, patch_redhat_subs
{'check_rc': False},
(0, 'system identity: b26df632-25ed-4452-8f89-0308bfd167cb', '')
),
(
['/testbin/subscription-manager', 'remove', '--all'],
{'check_rc': True},
(0, '', '')
),
(
['/testbin/subscription-manager', 'unregister'],
{'check_rc': True},
Expand Down

0 comments on commit add595e

Please sign in to comment.