NaNtic
/
ansible
mirror of https://github.com/NaN-tic/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

issue with activation_key and proxy on subscription-manager (#42624) 

* Update redhat_subscription.py

I need to use a proxy server/user/password also if I user an activation_key

* remove spaces
This commit is contained in:
Giuseppe Mancuso 2018-12-14 18:27:58 +01:00 committed by ansibot
parent 4ca38afe4a
commit d29f647f09
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ansible/modules/packaging/os/redhat_subscription.py
View File

@ -348,6 +348,15 @@ class Rhsm(RegistrationBase):
if org_id:
args.extend(['--org', org_id])
if server_proxy_hostname and server_proxy_port:
args.extend(['--proxy', server_proxy_hostname + ':' + server_proxy_port])
if server_proxy_user:
args.extend(['--proxyuser', server_proxy_user])
if server_proxy_password:
args.extend(['--proxypassword', server_proxy_password])
if activationkey:
args.extend(['--activationkey', activationkey])
else:
@ -365,12 +374,6 @@ class Rhsm(RegistrationBase):
args.extend(['--consumerid', consumer_id])
if environment:
args.extend(['--environment', environment])
if server_proxy_hostname and server_proxy_port:
args.extend(['--proxy', server_proxy_hostname + ':' + server_proxy_port])
if server_proxy_user:
args.extend(['--proxyuser', server_proxy_user])
if server_proxy_password:
args.extend(['--proxypassword', server_proxy_password])
if release:
args.extend(['--release', release])