ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

OpenNebula one_vm.py: Fix missing keys (#2435) (#2447)

Browse source 
* OpenNebula one_vm.py: Fix missing keys

* fixup OpenNebula one_vm.py: Fix missing keys

(cherry picked from commit aaa561163b)

Co-authored-by: Jan Orel <jorel@opennebula.io>
This commit is contained in:
patchback[bot] 2021-05-04 12:43:25 +02:00 committed by GitHub
parent 49b991527e
commit e670ca666a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/2435-one_vm-fix_missing_keys.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- one_vm - Allow missing NIC keys (https://github.com/ansible-collections/community.general/pull/2435).

17
plugins/modules/cloud/opennebula/one_vm.py
View file

@ -752,11 +752,20 @@ def get_vm_info(client, vm):
if 'NIC' in vm.TEMPLATE: if 'NIC' in vm.TEMPLATE:
if isinstance(vm.TEMPLATE['NIC'], list): if isinstance(vm.TEMPLATE['NIC'], list):
for nic in vm.TEMPLATE['NIC']: for nic in vm.TEMPLATE['NIC']:
networks_info.append({'ip': nic['IP'], 'mac': nic['MAC'], 'name': nic['NETWORK'], 'security_groups': nic['SECURITY_GROUPS']}) networks_info.append({
'ip': nic.get('IP', ''),
'mac': nic.get('MAC', ''),
'name': nic.get('NETWORK', ''),
'security_groups': nic.get('SECURITY_GROUPS', '')
})
else: else:
networks_info.append( networks_info.append({
{'ip': vm.TEMPLATE['NIC']['IP'], 'mac': vm.TEMPLATE['NIC']['MAC'], 'ip': vm.TEMPLATE['NIC'].get('IP', ''),
'name': vm.TEMPLATE['NIC']['NETWORK'], 'security_groups': vm.TEMPLATE['NIC']['SECURITY_GROUPS']}) 'mac': vm.TEMPLATE['NIC'].get('MAC', ''),
'name': vm.TEMPLATE['NIC'].get('NETWORK', ''),
'security_groups':
vm.TEMPLATE['NIC'].get('SECURITY_GROUPS', '')
})
import time import time
current_time = time.localtime() current_time = time.localtime()