x/compass-core
Code Issues Proposed changes

fix neutron configuration conflict in environment template

Browse Source 
in gre tunnel mode, bridge mappings should be null and vlan, or flat
mode, bridge mappings with bridge and a physical nic port.

Change-Id: I61ab71e65ac8e75c46d52453df12df4ecac1f675
Closes-bug: #1406710
This commit is contained in:
Jerry Zhao 2014-12-31 01:39:13 -08:00
parent d1ee9e7e36
commit 55aa8caafa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/templates/chef_installer/openstack_icehouse/environments/base.tmpl
View File

@ -58,10 +58,10 @@
## Set Openstack neutron config
#set tenant_network_type = $getDictValue('neutron_config/openvswitch/tenant_network_type', 'gre')
#set enable_tunneling = True
#set bridge_mappings = 'physnet1:br-eth1'
#set bridge_mappings = ''
#if $tenant_network_type != 'gre'
#set enable_tunneling = False
#set bridge_mappings = ''
#set bridge_mappings = 'physnet1:br-eth1'
#end if
## Utility functions definition