mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
[PR #6319/83994c0a backport][stable-6] redhat_subscription: use CLI when using environments (#6332)
redhat_subscription: use CLI when using environments (#6319)
It turns out that the 'environments' that the D-Bus Register*() APIs
accept are the IDs of the environments, and not the user-facing names of
the environments (which is what the module has been accepting so far).
Since there is no easy way to do the mapping manually, for now use again
the subscription-manager CLI for registering when environments are
specified.
(cherry picked from commit 83994c0a2d
)
Co-authored-by: Pino Toscano <ptoscano@redhat.com>
This commit is contained in:
parent
2c825f04e7
commit
c6316c1153
2 changed files with 9 additions and 2 deletions
|
@ -0,0 +1,5 @@
|
|||
bugfixes:
|
||||
- redhat_subscription - do not use D-Bus for registering when ``environment`` is specified,
|
||||
so it possible to specify again the environment names for registering,
|
||||
as the D-Bus APIs work only with IDs
|
||||
(https://github.com/ansible-collections/community.general/pull/6319).
|
|
@ -461,8 +461,10 @@ class Rhsm(RegistrationBase):
|
|||
* Exception - if any error occurs during the registration
|
||||
'''
|
||||
# There is no support for token-based registration in the D-Bus API
|
||||
# of rhsm, so always use the CLI in that case.
|
||||
if not token and self._can_connect_to_dbus():
|
||||
# of rhsm, so always use the CLI in that case;
|
||||
# also, since the specified environments are names, and the D-Bus APIs
|
||||
# require IDs for the environments, use the CLI also in that case
|
||||
if not token and not environment and self._can_connect_to_dbus():
|
||||
self._register_using_dbus(was_registered, username, password, auto_attach,
|
||||
activationkey, org_id, consumer_type,
|
||||
consumer_name, consumer_id,
|
||||
|
|
Loading…
Reference in a new issue