1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

redhat_subscription: Add support for Red Hat API token (#5725)

Add support for Red Hat API token

fix mixed up

fix version
This commit is contained in:
Eric C Chong 2023-01-05 15:36:07 -05:00 committed by GitHub
parent 84ebda65f1
commit 4dc897d559
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 6 deletions

View file

@ -0,0 +1,2 @@
minor_changes:
- redhat_subscription - adds ``token`` parameter for subscription-manager authentication using Red Hat API token (https://github.com/ansible-collections/community.general/pull/5725).

View file

@ -40,6 +40,11 @@ options:
description: description:
- access.redhat.com or Red Hat Satellite or Katello password - access.redhat.com or Red Hat Satellite or Katello password
type: str type: str
token:
description:
- sso.redhat.com API access token.
type: str
version_added: 6.3.0
server_hostname: server_hostname:
description: description:
- Specify an alternative Red Hat Subscription Management or Red Hat Satellite or Katello server - Specify an alternative Red Hat Subscription Management or Red Hat Satellite or Katello server
@ -294,10 +299,11 @@ class RegistrationBase(object):
REDHAT_REPO = "/etc/yum.repos.d/redhat.repo" REDHAT_REPO = "/etc/yum.repos.d/redhat.repo"
def __init__(self, module, username=None, password=None): def __init__(self, module, username=None, password=None, token=None):
self.module = module self.module = module
self.username = username self.username = username
self.password = password self.password = password
self.token = token
def configure(self): def configure(self):
raise NotImplementedError("Must be implemented by a sub-class") raise NotImplementedError("Must be implemented by a sub-class")
@ -340,8 +346,8 @@ class RegistrationBase(object):
class Rhsm(RegistrationBase): class Rhsm(RegistrationBase):
def __init__(self, module, username=None, password=None): def __init__(self, module, username=None, password=None, token=None):
RegistrationBase.__init__(self, module, username, password) RegistrationBase.__init__(self, module, username, password, token)
self.module = module self.module = module
def enable(self): def enable(self):
@ -397,7 +403,7 @@ class Rhsm(RegistrationBase):
else: else:
return False return False
def register(self, username, password, auto_attach, activationkey, org_id, def register(self, username, password, token, auto_attach, activationkey, org_id,
consumer_type, consumer_name, consumer_id, force_register, environment, consumer_type, consumer_name, consumer_id, force_register, environment,
release): release):
''' '''
@ -433,6 +439,8 @@ class Rhsm(RegistrationBase):
if activationkey: if activationkey:
args.extend(['--activationkey', activationkey]) args.extend(['--activationkey', activationkey])
elif token:
args.extend(['--token', token])
else: else:
if username: if username:
args.extend(['--username', username]) args.extend(['--username', username])
@ -794,6 +802,7 @@ def main():
'state': {'default': 'present', 'choices': ['present', 'absent']}, 'state': {'default': 'present', 'choices': ['present', 'absent']},
'username': {}, 'username': {},
'password': {'no_log': True}, 'password': {'no_log': True},
'token': {'no_log': True},
'server_hostname': {}, 'server_hostname': {},
'server_insecure': {}, 'server_insecure': {},
'server_prefix': {}, 'server_prefix': {},
@ -831,17 +840,20 @@ def main():
['server_proxy_hostname', 'server_proxy_port'], ['server_proxy_hostname', 'server_proxy_port'],
['server_proxy_user', 'server_proxy_password']], ['server_proxy_user', 'server_proxy_password']],
mutually_exclusive=[['activationkey', 'username'], mutually_exclusive=[['activationkey', 'username'],
['activationkey', 'token'],
['token', 'username'],
['activationkey', 'consumer_id'], ['activationkey', 'consumer_id'],
['activationkey', 'environment'], ['activationkey', 'environment'],
['activationkey', 'auto_attach'], ['activationkey', 'auto_attach'],
['pool', 'pool_ids']], ['pool', 'pool_ids']],
required_if=[['state', 'present', ['username', 'activationkey'], True]], required_if=[['state', 'present', ['username', 'activationkey', 'token'], True]],
) )
rhsm.module = module rhsm.module = module
state = module.params['state'] state = module.params['state']
username = module.params['username'] username = module.params['username']
password = module.params['password'] password = module.params['password']
token = module.params['token']
server_hostname = module.params['server_hostname'] server_hostname = module.params['server_hostname']
server_insecure = module.params['server_insecure'] server_insecure = module.params['server_insecure']
server_prefix = module.params['server_prefix'] server_prefix = module.params['server_prefix']
@ -914,7 +926,7 @@ def main():
try: try:
rhsm.enable() rhsm.enable()
rhsm.configure(**module.params) rhsm.configure(**module.params)
rhsm.register(username, password, auto_attach, activationkey, org_id, rhsm.register(username, password, token, auto_attach, activationkey, org_id,
consumer_type, consumer_name, consumer_id, force_register, consumer_type, consumer_name, consumer_id, force_register,
environment, release) environment, release)
if syspurpose and 'sync' in syspurpose and syspurpose['sync'] is True: if syspurpose and 'sync' in syspurpose and syspurpose['sync'] is True:

View file

@ -102,6 +102,37 @@ TEST_CASES = [
'msg': "System successfully registered to 'satellite.company.com'." 'msg': "System successfully registered to 'satellite.company.com'."
} }
], ],
# Test simple registration using token
[
{
'state': 'present',
'server_hostname': 'satellite.company.com',
'token': 'fake_token',
},
{
'id': 'test_registeration_token',
'run_command.calls': [
(
['/testbin/subscription-manager', 'identity'],
{'check_rc': False},
(1, '', '')
),
(
['/testbin/subscription-manager', 'config', '--server.hostname=satellite.company.com'],
{'check_rc': True},
(0, '', '')
),
(
['/testbin/subscription-manager', 'register',
'--token', 'fake_token'],
{'check_rc': True, 'expand_user_and_vars': False},
(0, '', '')
)
],
'changed': True,
'msg': "System successfully registered to 'satellite.company.com'."
}
],
# Test unregistration, when system is unregistered # Test unregistration, when system is unregistered
[ [
{ {