summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil BoratyƄski <kamilboratynski@users.noreply.github.com>2017-01-26 19:28:24 +0100
committerAdrian Likins <alikins@redhat.com>2017-01-26 13:28:24 -0500
commit9d8c1923ab669681230c3f87b839016f3e57da08 (patch)
treef5cfef77f7499fce1189e852f0317e886af553c6
parent47892a0034ae6869b5e9f46f4a7f00cf68759b57 (diff)
downloadansible-9d8c1923ab669681230c3f87b839016f3e57da08.tar.gz
[redhat_subscription]: fixed force option. (#20667)
`force` option is not unique for non-activationkey registrations and it should be parsed separately; it is possible to register host with activation key and force such process.
-rw-r--r--lib/ansible/modules/packaging/os/redhat_subscription.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ansible/modules/packaging/os/redhat_subscription.py b/lib/ansible/modules/packaging/os/redhat_subscription.py
index e0fbe01642..c1a4324d7b 100644
--- a/lib/ansible/modules/packaging/os/redhat_subscription.py
+++ b/lib/ansible/modules/packaging/os/redhat_subscription.py
@@ -292,6 +292,9 @@ class Rhsm(RegistrationBase):
args = [SUBMAN_CMD, 'register']
# Generate command arguments
+ if force_register:
+ args.extend(['--force'])
+
if activationkey:
args.extend(['--activationkey', activationkey])
args.extend(['--org', org_id])
@@ -308,8 +311,6 @@ class Rhsm(RegistrationBase):
args.extend(['--name', consumer_name])
if consumer_id:
args.extend(['--consumerid', consumer_id])
- if force_register:
- args.extend(['--force'])
if environment:
args.extend(['--environment', environment])