cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pass server_hostname from task to subscription-manager (#27420)

Browse source
This commit is contained in:
Martin Krizek 2017-07-31 15:15:15 +02:00 committed by jctanner
parent 43d3c092fa
commit 19d119f43c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/packaging/os/redhat_subscription.py
View file

@ -344,7 +344,7 @@ class Rhsm(RegistrationBase):
def register(self, username, password, autosubscribe, activationkey, org_id, def register(self, username, password, autosubscribe, activationkey, org_id,
consumer_type, consumer_name, consumer_id, force_register, environment, consumer_type, consumer_name, consumer_id, force_register, environment,
rhsm_baseurl, server_insecure): rhsm_baseurl, server_insecure, server_hostname):
''' '''
Register the current system to the provided RHSM or Sat6 server Register the current system to the provided RHSM or Sat6 server
Raises: Raises:
@ -362,6 +362,9 @@ class Rhsm(RegistrationBase):
if server_insecure: if server_insecure:
args.extend(['--insecure']) args.extend(['--insecure'])
if server_hostname:
args.extend(['--serverurl', server_hostname])
if activationkey: if activationkey:
args.extend(['--activationkey', activationkey]) args.extend(['--activationkey', activationkey])
args.extend(['--org', org_id]) args.extend(['--org', org_id])
@ -725,7 +728,7 @@ def main():
rhsm.configure(**module.params) rhsm.configure(**module.params)
rhsm.register(username, password, autosubscribe, activationkey, org_id, rhsm.register(username, password, autosubscribe, activationkey, org_id,
consumer_type, consumer_name, consumer_id, force_register, consumer_type, consumer_name, consumer_id, force_register,
environment, rhsm_baseurl, server_insecure) environment, rhsm_baseurl, server_insecure, server_hostname)
if pool_ids: if pool_ids:
subscribed_pool_ids = rhsm.subscribe_by_pool_ids(pool_ids) subscribed_pool_ids = rhsm.subscribe_by_pool_ids(pool_ids)
else: else: