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

Enable use of empty manageiq arguments (#31774)

Browse source 
* anable use of empty manageiq arguments

* make default verify_ssl true
This commit is contained in:
Yaacov Zamir 2017-10-23 14:33:57 +03:00 committed by René Moser
parent 6693cc3f5a
commit 2765ee4b9a
4 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/module_utils/manageiq.py
View file

@ -37,7 +37,7 @@ except ImportError:
def manageiq_argument_spec():
return dict(
options = dict(
url=dict(default=os.environ.get('MIQ_URL', None)),
username=dict(default=os.environ.get('MIQ_USERNAME', None)),
password=dict(default=os.environ.get('MIQ_PASSWORD', None), no_log=True),
@ -46,6 +46,12 @@ def manageiq_argument_spec():
ca_bundle_path=dict(required=False, default=None),
)
return dict(
manageiq_connection=dict(type='dict',
default=dict(verify_ssl=True),
options=options),
)
def check_client(module):
if not HAS_CLIENT:

4
lib/ansible/modules/remote_management/manageiq/manageiq_provider.py
View file

@ -548,14 +548,14 @@ def main():
zone_id = None
endpoints = []
argument_spec = dict(
manageiq_connection=dict(required=True, type='dict',
options=manageiq_argument_spec()),
state=dict(choices=['absent', 'present'], default='present'),
name=dict(required=True),
zone=dict(default='default'),
provider_region=dict(),
type=dict(choices=supported_providers().keys()),
)
# add the manageiq connection arguments to the arguments
argument_spec.update(manageiq_argument_spec())
# add the endpoint arguments to the arguments
argument_spec.update(endpoint_list_spec())

21
lib/ansible/modules/remote_management/manageiq/manageiq_tags.py
View file

@ -246,18 +246,19 @@ class ManageIQTags(object):
def main():
actions = {'present': 'assign', 'absent': 'unassign', 'list': 'list'}
argument_spec = dict(
tags=dict(type='list'),
resource_name=dict(required=True, type='str'),
resource_type=dict(required=True, type='str',
choices=manageiq_entities().keys()),
state=dict(required=False, type='str',
choices=['present', 'absent', 'list'], default='present'),
)
# add the manageiq connection arguments to the arguments
argument_spec.update(manageiq_argument_spec())
module = AnsibleModule(
argument_spec=dict(
manageiq_connection=dict(required=True, type='dict',
options=manageiq_argument_spec()),
tags=dict(type='list'),
resource_name=dict(required=True, type='str'),
resource_type=dict(required=True, type='str',
choices=manageiq_entities().keys()),
state=dict(required=False, type='str',
choices=['present', 'absent', 'list'], default='present'),
),
argument_spec=argument_spec,
required_if=[
('state', 'present', ['tags']),
('state', 'absent', ['tags'])

26
lib/ansible/modules/remote_management/manageiq/manageiq_user.py
View file

@ -283,19 +283,21 @@ class ManageIQUser(object):
def main():
argument_spec = dict(
userid=dict(required=True, type='str'),
name=dict(),
password=dict(no_log=True),
group=dict(),
email=dict(),
state=dict(choices=['absent', 'present'], default='present'),
update_password=dict(choices=['always', 'on_create'],
default='always'),
)
# add the manageiq connection arguments to the arguments
argument_spec.update(manageiq_argument_spec())
module = AnsibleModule(
argument_spec=dict(
manageiq_connection=dict(required=True, type='dict',
options=manageiq_argument_spec()),
userid=dict(required=True, type='str'),
name=dict(),
password=dict(no_log=True),
group=dict(),
email=dict(),
state=dict(choices=['absent', 'present'], default='present'),
update_password=dict(choices=['always', 'on_create'],
default='always'),
),
argument_spec=argument_spec,
)
userid = module.params['userid']