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

Do not require password when deleting os_user (#5601)

Browse source 
I broke backwards compat with the addition to define when a password
should be updated. It was requiring that a password value be passed when
deleting a user, which seems silly.

This moves the argument logic out of the argument spec and into when it
would be needed, when state is present.
This commit is contained in:
Jesse Keating 2016-11-16 05:45:16 -08:00 committed by Matt Clay
parent be7af0193d
commit 4c3f8cbd92
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/cloud/openstack/os_user.py
View file

@ -191,10 +191,6 @@ def main():
module_kwargs = openstack_module_kwargs() module_kwargs = openstack_module_kwargs()
module = AnsibleModule( module = AnsibleModule(
argument_spec, argument_spec,
required_if=[
('update_password', 'always', ['password']),
('update_password', 'on_create', ['password']),
],
**module_kwargs) **module_kwargs)
if not HAS_SHADE: if not HAS_SHADE:
@ -219,6 +215,11 @@ def main():
domain_id = _get_domain_id(opcloud, domain) domain_id = _get_domain_id(opcloud, domain)
if state == 'present': if state == 'present':
if update_password in ('always', 'on_create'):
if not password:
msg = ("update_password is %s but a password value is "
"missing") % update_password
self.fail_json(msg=msg)
default_project_id = None default_project_id = None
if default_project: if default_project:
default_project_id = _get_default_project_id(cloud, default_project) default_project_id = _get_default_project_id(cloud, default_project)