From cc9bc3169908ef170417cf94bb57d43ceaa9fe6d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 13 May 2015 11:37:43 -0400 Subject: [PATCH] LBaaS: update device_driver for Kilo Neutron LBaaS plugin has been pulled out from Neutron core so the device_driver Python plugin is now neutron_lbaas_*. This patch breaks Juno deployments. Doc: http://docs.openstack.org/admin-guide-cloud/content/install_neutron-lbaas-agent.html Change-Id: I00085a1f6d5431256146aa5e9d4b506f33cf95fe --- manifests/agents/lbaas.pp | 4 ++-- spec/classes/neutron_agents_lbaas_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/agents/lbaas.pp b/manifests/agents/lbaas.pp index a6ae3ac8a..f73c39468 100644 --- a/manifests/agents/lbaas.pp +++ b/manifests/agents/lbaas.pp @@ -21,7 +21,7 @@ # (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'. # # [*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*] # (optional) Allow overlapping IP (Must have kernel build with @@ -43,7 +43,7 @@ class neutron::agents::lbaas ( $manage_service = true, $debug = false, $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, $user_group = $::neutron::params::nobody_user_group, $manage_haproxy_package = true, diff --git a/spec/classes/neutron_agents_lbaas_spec.rb b/spec/classes/neutron_agents_lbaas_spec.rb index db1c64695..08f08fba8 100644 --- a/spec/classes/neutron_agents_lbaas_spec.rb +++ b/spec/classes/neutron_agents_lbaas_spec.rb @@ -15,7 +15,7 @@ describe 'neutron::agents::lbaas' do :enabled => true, :debug => false, :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, :manage_haproxy_package => true }