internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

use require_if to check for username or AK instead of custom code (#20937)

Browse Source 
the logical or parameter to require_if was introduced in #20220
This commit is contained in:
Evgeni Golov
2017-02-06 19:53:12 +01:00
committed by Adrian Likins
parent 770fb03157
commit 827723db90
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -490,6 +490,7 @@ def main():
),
required_together = [ ['username', 'password'], ['activationkey', 'org_id'] ],
mutually_exclusive = [ ['username', 'activationkey'] ],
required_if = [ [ 'state', 'present', ['username', 'activationkey'], True ] ],
)
rhsm.module = module
@@ -515,10 +516,6 @@ def main():
# Ensure system is registered
if state == 'present':
# Check for missing parameters ...
if not (activationkey or org_id or username or password):
module.fail_json(msg="Missing arguments, must supply an activationkey (%s) and Organization ID (%s) or username (%s) and password (%s)" % (activationkey, org_id, username, password))
# Register system
if rhsm.is_registered and not force_register:
if pool != '^$':