internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes idempotency check for partial configurations (#41941)

Browse Source 
- Previous PR would overwrite new and existing values improperly
This commit is contained in:
Kevin Breit
2018-06-26 05:14:01 -05:00
committed by Dag Wieers
parent 4e275a4ba8
commit 7ab3f755ce
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ansible/modules/network/meraki/meraki_network.py
View File

@@ -184,14 +184,11 @@ def main():
if meraki.params['state'] == 'present':
payload = {'name': meraki.params['net_name'],
'type': meraki.params['type'],
'tags': meraki.params['tags'],
}
if meraki.params['tags']:
payload['tags'] = construct_tags(meraki.params['tags'])
if meraki.params['timezone']:
payload['timeZone'] = meraki.params['timezone']
else:
payload['timeZone'] = 'America/Los_Angeles'
if meraki.params['type'] == 'combined':
payload['type'] = 'switch wireless appliance'
@@ -225,6 +222,16 @@ def main():
meraki.result['changed'] = True
else:
net = meraki.get_net(meraki.params['org_name'], meraki.params['net_name'], data=nets)
proposed = payload
if meraki.params['timezone']:
proposed['timeZone'] = meraki.params['timezone']
else:
proposed['timeZone'] = 'America/Los_Angeles'
if not meraki.params['tags']:
proposed['tags'] = None
if not proposed['type']:
proposed['type'] = net['type']
if meraki.is_update_required(net, payload):
path = meraki.construct_path('update',
net_id=meraki.get_net_id(net_name=meraki.params['net_name'], data=nets)