openstack/openstack-ansible
Code Issues Proposed changes

Fix br-vlan port in multi-node bootstrap-host

Browse Source 
When running the bootstrap-host role with bootstrap_host_aio_config: no
and bootstrap_host_encapsulation_enabled: yes, the br-vlan bridge gets
attached to encap-vxlan instead of encap-vlan.

Change-Id: I51e0932773c7b09061ef499b7b145f61ea729347
Closes-bug: 1626615
This commit is contained in:
Daniel Gonzalez 2016-09-22 17:04:14 +02:00
parent 8255414408
commit 350c0611cf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/roles/bootstrap-host/defaults/main.yml
View File

@ -112,7 +112,7 @@ bootstrap_host_bridges_interfaces:
ip_netmask: "{{ netmask }}"
br-vlan:
mode: "{{ bridge_vlan_inet_mode | default('static') }}"
ports: "{{ bootstrap_host_encapsulation_enabled | bool | ternary ('encap-vxlan', bootstrap_host_bridge_vlan_ports) }}"
ports: "{{ bootstrap_host_encapsulation_enabled | bool | ternary ('encap-vlan', bootstrap_host_bridge_vlan_ports) }}"
ip_address_range: "{{ vlan_range }}"
ip_netmask: "{{ netmask }}"
state_change_scripts: "{{ bridge_vlan_state_change_scripts }}"