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

cloud: ovirt: fix update_params for ovirt module_utils (#22637)

Browse source
This commit is contained in:
Ondra Machacek 2017-03-15 13:04:06 +01:00 committed by Ryan Brown
parent bb7e7be71f
commit 699df5824d
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/module_utils/ovirt.py
View file

@ -505,7 +505,15 @@ class BaseModule(object):
return after return after
def create(self, entity=None, result_state=None, fail_condition=lambda e: False, search_params=None, **kwargs): def create(
self,
entity=None,
result_state=None,
fail_condition=lambda e: False,
search_params=None,
update_params=None,
**kwargs
):
""" """
Method which is called when state of the entity is 'present'. If user Method which is called when state of the entity is 'present'. If user
don't provide `entity` parameter the entity is searched using don't provide `entity` parameter the entity is searched using
@ -521,6 +529,7 @@ class BaseModule(object):
:param result_state: State which should entity has in order to finish task. :param result_state: State which should entity has in order to finish task.
:param fail_condition: Function which checks incorrect state of entity, if it returns `True` Exception is raised. :param fail_condition: Function which checks incorrect state of entity, if it returns `True` Exception is raised.
:param search_params: Dictionary of parameters to be used for search. :param search_params: Dictionary of parameters to be used for search.
:param update_params: The params which should be passed to update method.
:param kwargs: Additional parameters passed when creating entity. :param kwargs: Additional parameters passed when creating entity.
:return: Dictionary with values returned by Ansible module. :return: Dictionary with values returned by Ansible module.
""" """
@ -535,7 +544,11 @@ class BaseModule(object):
if not self.update_check(entity): if not self.update_check(entity):
new_entity = self.build_entity() new_entity = self.build_entity()
if not self._module.check_mode: if not self._module.check_mode:
updated_entity = entity_service.update(new_entity) update_params = update_params or {}
updated_entity = entity_service.update(
new_entity,
**update_params
)
self.post_update(entity) self.post_update(entity)
# Update diffs only if user specified --diff paramter, # Update diffs only if user specified --diff paramter,