From 55aa8caafa7d8bd4e2c536c5750451c8f32ef84e Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Wed, 31 Dec 2014 01:39:13 -0800 Subject: [PATCH] fix neutron configuration conflict in environment template 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 --- .../chef_installer/openstack_icehouse/environments/base.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/templates/chef_installer/openstack_icehouse/environments/base.tmpl b/conf/templates/chef_installer/openstack_icehouse/environments/base.tmpl index 758e7ce4..426a1a68 100644 --- a/conf/templates/chef_installer/openstack_icehouse/environments/base.tmpl +++ b/conf/templates/chef_installer/openstack_icehouse/environments/base.tmpl @@ -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