Fix ovs_use_veth default in dhcp_agent.ini

The correct default for ovs_use_veth is False in IceHouse.
Fix the default and add a test case.

Change-Id: I156a61926987a10160835068fd84e8462ff58f7c
Closes-Bug: #1318790
This commit is contained in:
Mark Vanderwiel 2014-05-12 14:44:14 -05:00
parent 6d252ac484
commit ec78019024
4 changed files with 8 additions and 2 deletions

View File

@ -1,5 +1,7 @@
# CHANGELOG for cookbook-openstack-network
This file is used to list changes made in each version of cookbook-openstack-network.
## 9.0.6
* Fix ovs_use_veth default value
## 9.0.5
* Switch to using auth_url instead of auth_host et al

View File

@ -232,7 +232,7 @@ default['openstack']['network']['dhcp']['resync_interval'] = 5
# OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
# as OpenFlow switch and check port status
default['openstack']['network']['dhcp']['ovs_use_veth'] = 'True'
default['openstack']['network']['dhcp']['ovs_use_veth'] = 'False'
# The DHCP server can assist with providing metadata support on isolated
# networks. Setting this value to True will cause the DHCP server to append

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 '9.0.4'
version '9.0.6'
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'

View File

@ -82,6 +82,10 @@ describe 'openstack-network::dhcp_agent' do
expect(chef_run).to render_file(file.name).with_content('use_namespaces = True')
end
it 'disables ovs_use_veth' do
expect(chef_run).to render_file(file.name).with_content('ovs_use_veth = False')
end
it 'checks dhcp domain' do
expect(chef_run).to render_file(file.name).with_content(/^dhcp_domain = openstacklocal$/)
end