x/compass-core
Code Issues Proposed changes

Merge "fix neutron configuration conflict in environment template" into dev/experimental

Browse Source
This commit is contained in:
Jenkins 2015-01-04 07:27:02 +00:00 committed by Gerrit Code Review
commit 7423682471
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