From 28797b0aa9815bf99cc9f60738d38670add33aba Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 17 Aug 2016 16:19:12 +0200 Subject: [PATCH] Specify node_network_info is a dict 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 --- playbooks/library/network_metadata.py | 2 +- playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/library/network_metadata.py b/playbooks/library/network_metadata.py index e320c201b..bbe1cb6bb 100644 --- a/playbooks/library/network_metadata.py +++ b/playbooks/library/network_metadata.py @@ -34,7 +34,7 @@ def main(): vlan_id=dict(required=False), network_mtu=dict(required=False), nics=dict(required=False, type='list'), - node_network_info=dict(required=False) + node_network_info=dict(required=False, type='dict') ) module = AnsibleModule(argument_spec) diff --git a/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml b/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml index 1406e699a..e7195fa8f 100644 --- a/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml +++ b/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml @@ -48,7 +48,7 @@ vlan_id: "{{ vlan_id | default('') }}" network_mtu: "{{ network_mtu | default('1500') }}" 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 - name: "Place network info template in each openstack/latest folder" template: