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

ovirt-host-network: support commit on success (#59212)

Browse source 
In ovirt-engine 4.3 and onwards a 'commit on success' parameter is
available. It is used to commit a network configuration automatically
upon successful application of the configuration without needing a
separate save request.

Therefore since ansible 2.8 if the 'save' parameter is specified as
'true' the commit on success parameter will be set to true and used
instead of making an additional save request.
This commit is contained in:
Eitan Raviv 2019-07-18 13:39:32 +03:00 committed by ansibot
parent 9489433a4d
commit 264945d75f
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/modules/cloud/ovirt/ovirt_host_network.py
View file

@ -186,6 +186,7 @@ from ansible.module_utils.ovirt import (
get_link_name, get_link_name,
ovirt_full_argument_spec, ovirt_full_argument_spec,
search_by_name, search_by_name,
engine_supported
) )
@ -323,7 +324,6 @@ class HostNetworksModule(BaseModule):
return update return update
def _action_save_configuration(self, entity): def _action_save_configuration(self, entity):
if self._module.params['save']:
if not self._module.check_mode: if not self._module.check_mode:
self._service.service(entity.id).commit_net_config() self._service.service(entity.id).commit_net_config()
self.changed = True self.changed = True
@ -414,10 +414,9 @@ def main():
removed_bonds.append(otypes.HostNic(id=host_nic.id)) removed_bonds.append(otypes.HostNic(id=host_nic.id))
# Assign the networks: # Assign the networks:
host_networks_module.action( setup_params = dict(
entity=host, entity=host,
action='setup_networks', action='setup_networks',
post_action=host_networks_module._action_save_configuration,
check_connectivity=module.params['check'], check_connectivity=module.params['check'],
removed_bonds=removed_bonds if removed_bonds else None, removed_bonds=removed_bonds if removed_bonds else None,
modified_bonds=[ modified_bonds=[
@ -466,6 +465,11 @@ def main():
) for network in networks ) for network in networks
] if networks else None, ] if networks else None,
) )
if engine_supported(connection, '4.3'):
setup_params['commit_on_success'] = module.params['save']
elif module.params['save']:
setup_params['post_action'] = host_networks_module._action_save_configuration
host_networks_module.action(**setup_params)
elif state == 'absent' and nic: elif state == 'absent' and nic:
attachments = [] attachments = []
nic_service = nics_service.nic_service(nic.id) nic_service = nics_service.nic_service(nic.id)
@ -491,10 +495,9 @@ def main():
# Need to check if there are any labels to be removed, as backend fail # Need to check if there are any labels to be removed, as backend fail
# if we try to send remove non existing label, for bond and attachments it's OK: # if we try to send remove non existing label, for bond and attachments it's OK:
if (labels and set(labels).intersection(attached_labels)) or bond or attachments: if (labels and set(labels).intersection(attached_labels)) or bond or attachments:
host_networks_module.action( setup_params = dict(
entity=host, entity=host,
action='setup_networks', action='setup_networks',
post_action=host_networks_module._action_save_configuration,
check_connectivity=module.params['check'], check_connectivity=module.params['check'],
removed_bonds=[ removed_bonds=[
otypes.HostNic( otypes.HostNic(
@ -506,6 +509,11 @@ def main():
] if labels else None, ] if labels else None,
removed_network_attachments=attachments if attachments else None, removed_network_attachments=attachments if attachments else None,
) )
if engine_supported(connection, '4.3'):
setup_params['commit_on_success'] = module.params['save']
elif module.params['save']:
setup_params['post_action'] = host_networks_module._action_save_configuration
host_networks_module.action(**setup_params)
nic = search_by_name(nics_service, nic_name) nic = search_by_name(nics_service, nic_name)
module.exit_json(**{ module.exit_json(**{