summaryrefslogtreecommitdiff
path: root/cloud/openstack/os_user.py
diff options
context:
space:
mode:
Diffstat (limited to 'cloud/openstack/os_user.py')
-rw-r--r--cloud/openstack/os_user.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/cloud/openstack/os_user.py b/cloud/openstack/os_user.py
index 264eb3f8..831f2fa9 100644
--- a/cloud/openstack/os_user.py
+++ b/cloud/openstack/os_user.py
@@ -191,10 +191,6 @@ def main():
module_kwargs = openstack_module_kwargs()
module = AnsibleModule(
argument_spec,
- required_if=[
- ('update_password', 'always', ['password']),
- ('update_password', 'on_create', ['password']),
- ],
**module_kwargs)
if not HAS_SHADE:
@@ -219,6 +215,11 @@ def main():
domain_id = _get_domain_id(opcloud, domain)
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
if default_project:
default_project_id = _get_default_project_id(cloud, default_project)