openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Add tunnel_types in ovs_neutron_plugin.ini.erb 

Nowadays, there is no tunnel_types item in ovs_
neutron_plugin.ini.erb template. And user can not
assign value to this item by environment. Therefore,
the vxlan enablement will failure because of the item
default value is '[]' which will disable tunneling
support in the agent.

Fixes bug #1355663

Change-Id: I21378cbc3fe021b6763dd9f560e027ddd704c982
This commit is contained in:
Hu 2014-08-14 09:20:02 +08:00 committed by Wei Hu
parent df420eec3d
commit 802685281c
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,6 +1,9 @@
# CHANGELOG for cookbook-openstack-network
This file is used to list changes made in each version of cookbook-openstack-network.
## 10.0.1
* Add tunnel_types item in ovs_neutron_plugin.ini.erb
## 10.0.0
* Upgrading to Juno
* Sync conf files with Juno

9
attributes/default.rb
View File

@ -453,6 +453,15 @@ default['openstack']['network']['openvswitch']['bridge_mapping_interface'] = nil
# Agent's polling interval in seconds
default['openstack']['network']['openvswitch']['polling_interval'] = 2
# The types of tenant network tunnels supported by the openvswitch agent.
# Setting this will enable tunneling support in the agent. This can be set to
# either 'gre' or 'vxlan'. If this is unset, it will default to [] and
# disable tunneling in the agent. When running the agent with the OVS
# plugin, this value must be the same as "tunnel_type" in the "[ovs]" section.
# When running the agent with ML2, you can specify as many values here as
# your compute hosts support.
default['openstack']['network']['openvswitch']['tunnel_types'] = nil
# Agent's MTU size of veth interfaces
# With openvswitch vlan, default of veth_mtu = 1500 is 4 bytes short and you end up
# with either no traffic or abysmal network performance. Need the 4 extra bytes for

2
metadata.rb
View File

@ -5,7 +5,7 @@ maintainer 'Jay Pipes <jaypipes@gmail.com>'
license 'Apache 2.0'
description 'Installs and configures the OpenStack Network API Service and various agents and plugins'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '10.0.0'
version '10.0.1'
recipe 'openstack-network::client', 'Install packages required for network client'
recipe 'openstack-network::server', 'Installs packages required for a OpenStack Network server'
recipe 'openstack-network::openvswitch', 'Installs packages required for OVS'

3
spec/openvswitch_spec.rb
View File

@ -149,7 +149,8 @@ describe 'openstack-network::openvswitch' do
/^tunnel_id_ranges =$/,
/^int_peer_patch_port =$/,
/^tun_peer_patch_port =$/,
/^bridge_mappings =$/
/^bridge_mappings =$/,
/^tunnel_types =$/
].each do |content|
it "does not have a #{content.source[1...-1]} line" do
expect(chef_run).not_to render_file(file.name).with_content(content)

3
templates/default/plugins/openvswitch/ovs_neutron_plugin.ini.erb
View File

@ -131,6 +131,9 @@ polling_interval = <%= node['openstack']['network']['openvswitch']['polling_inte
# Example: tunnel_types = gre
# Example: tunnel_types = vxlan
# Example: tunnel_types = vxlan, gre
<% if node["openstack"]["network"]["openvswitch"]["tunnel_types"] -%>
tunnel_types = <%= node["openstack"]["network"]["openvswitch"]["tunnel_types"] %>
<% end -%>
# (IntOpt) The port number to utilize if tunnel_types includes 'vxlan'. By
# default, this will make use of the Open vSwitch default value of '4789' if