openstack/bifrost
Code Issues Proposed changes

Specify node_network_info is a dict

Browse Source 
If we don't set this to a dict, the bifrost_configdrives_dynamic
fail if node_network_info is empty, since it converts it to '',
instead of {}.

Change-Id: Ic6db4288fbb7945525cf2d7dd4cc8a4afbf80565
This commit is contained in:
Ricardo Carrillo Cruz 2016-08-17 16:19:12 +02:00
parent c6fc3b01c2
commit 28797b0aa9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/library/network_metadata.py
View File

@ -34,7 +34,7 @@ def main():
vlan_id=dict(required=False), vlan_id=dict(required=False),
network_mtu=dict(required=False), network_mtu=dict(required=False),
nics=dict(required=False, type='list'), nics=dict(required=False, type='list'),
node_network_info=dict(required=False) node_network_info=dict(required=False, type='dict')
) )
module = AnsibleModule(argument_spec) module = AnsibleModule(argument_spec)

2
playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml
View File

@ -48,7 +48,7 @@
vlan_id: "{{ vlan_id | default('') }}" vlan_id: "{{ vlan_id | default('') }}"
network_mtu: "{{ network_mtu | default('1500') }}" network_mtu: "{{ network_mtu | default('1500') }}"
nics: "{{ nics | default(omit) }}" nics: "{{ nics | default(omit) }}"
node_network_info: "{{ node_network_info | default('') }}" node_network_info: "{{ node_network_info | default({}) }}"
when: addressing_mode is undefined or "dhcp" not in addressing_mode when: addressing_mode is undefined or "dhcp" not in addressing_mode
- name: "Place network info template in each openstack/latest folder" - name: "Place network info template in each openstack/latest folder"
template: template: