openstack/bifrost
Code Issues Proposed changes

Allow a defined but not dhcp addressing_mode

Browse Source 
In some work we're doing, we override addressing_mode with the
string 'static'. This should lead to getting network_info.json in our
configdrives, but it doesn't because the test logic in these tasks isn't
right. It has been tested, and the undefined test short circuits, so
we don't ever get errors whether the value is defined as dhcp, static,
or undefined.

Change-Id: I01f42c003dae21b3f25e2f760214ba876ae1aea9
This commit is contained in:
Clint Byrum 2016-03-19 14:43:10 -07:00
parent 2bbe254017
commit 160939d887
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,12 +49,12 @@
network_mtu: "{{ network_mtu | default('1500') }}"
nics: "{{ nics | default('') }}"
node_network_info: "{{ node_network_info | default('') }}"
when: addressing_mode is undefined and '"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"
template:
src: network_info.json.j2
dest: "{{ variable_configdrive_location.stdout }}/{{ uuid }}/openstack/latest/network_info.json"
when: addressing_mode is undefined and '"dhcp" not in addressing_mode'
when: addressing_mode is undefined or "dhcp" not in addressing_mode
- name: "Make metadata folder - /openstack/latest"
file:
state: directory