openstack/bifrost
Code Issues Proposed changes

Merge "Allow a defined but not dhcp addressing_mode"

Browse Source
This commit is contained in:
Jenkins 2016-03-21 15:50:28 +00:00 committed by Gerrit Code Review
commit 0a7af82af4
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') }}" 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 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" - name: "Place network info template in each openstack/latest folder"
template: template:
src: network_info.json.j2 src: network_info.json.j2
dest: "{{ variable_configdrive_location.stdout }}/{{ uuid }}/openstack/latest/network_info.json" 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" - name: "Make metadata folder - /openstack/latest"
file: file:
state: directory state: directory