openstack/puppet-neutron
Code Issues Proposed changes

Merge "LBaaS: update device_driver for Kilo"

Browse Source
This commit is contained in:
Jenkins 2015-06-10 16:43:53 +00:00 committed by Gerrit Code Review
commit 62a0fc3e2d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agents/lbaas.pp
View File

@ -21,7 +21,7 @@
# (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'. # (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
# #
# [*device_driver*] # [*device_driver*]
# (optional) Defaults to 'neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver'. # (optional) Defaults to 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver'.
# #
# [*use_namespaces*] # [*use_namespaces*]
# (optional) Allow overlapping IP (Must have kernel build with # (optional) Allow overlapping IP (Must have kernel build with
@ -43,7 +43,7 @@ class neutron::agents::lbaas (
$manage_service = true, $manage_service = true,
$debug = false, $debug = false,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$device_driver = 'neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver', $device_driver = 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
$use_namespaces = true, $use_namespaces = true,
$user_group = $::neutron::params::nobody_user_group, $user_group = $::neutron::params::nobody_user_group,
$manage_haproxy_package = true, $manage_haproxy_package = true,

2
spec/classes/neutron_agents_lbaas_spec.rb
View File

@ -15,7 +15,7 @@ describe 'neutron::agents::lbaas' do
:enabled => true, :enabled => true,
:debug => false, :debug => false,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver', :interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:device_driver => 'neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver', :device_driver => 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
:use_namespaces => true, :use_namespaces => true,
:manage_haproxy_package => true :manage_haproxy_package => true
} }