lbaas: remove lbaasv1 and enable lbaasv2 by default
Upstream has just removed lbaasv1 from openstack-lbaas (https://review.openstack.org/286381). Let's follow them and provide a working lbaas deployment for our users on Newton. - Switch-on lbaasv2 by default instead of lbaasv1 to follow what upstream Neutron is doing in https://review.openstack.org/286381 and also switch default device_driver to be neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver - remove lbaasv1 support. - enable_v1 and enable_v2 are deprecated in neutron::agents::lbaas. Change-Id: I1c032c53b61face152bb37dfac4646db11403e4e
This commit is contained in:
parent
7ad7a07e50
commit
7b60d759fc
|
@ -21,7 +21,7 @@
|
|||
# (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
|
||||
#
|
||||
# [*device_driver*]
|
||||
# (optional) Defaults to 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver'.
|
||||
# (optional) Defaults to 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver'.
|
||||
#
|
||||
# [*user_group*]
|
||||
# (optional) The user group.
|
||||
|
@ -37,13 +37,17 @@
|
|||
# in the lbaas config.
|
||||
# Defaults to false.
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*enable_v1*]
|
||||
# (optional) Whether to use lbaas v1 agent or not.
|
||||
# Defaults to true
|
||||
# Deprecated. Will be removed in Ocata.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*enable_v2*]
|
||||
# (optional) Whether to use lbaas v2 agent or not.
|
||||
# Defaults to false
|
||||
# Deprecated. Will be removed in Ocata.
|
||||
# Defaults to undef
|
||||
#
|
||||
class neutron::agents::lbaas (
|
||||
$package_ensure = present,
|
||||
|
@ -51,24 +55,25 @@ class neutron::agents::lbaas (
|
|||
$manage_service = true,
|
||||
$debug = $::os_service_default,
|
||||
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
|
||||
$device_driver = 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
|
||||
$device_driver = 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver',
|
||||
$user_group = $::neutron::params::nobody_user_group,
|
||||
$manage_haproxy_package = true,
|
||||
$purge_config = false,
|
||||
$enable_v1 = true,
|
||||
$enable_v2 = false,
|
||||
# DEPRECATED PARAMETERS
|
||||
$enable_v1 = undef,
|
||||
$enable_v2 = undef,
|
||||
) {
|
||||
|
||||
include ::neutron::deps
|
||||
include ::neutron::params
|
||||
|
||||
if $enable_v1 and $enable_v2 {
|
||||
fail('neutron agents LBaaS enable_v1 and enable_v2 parameters cannot both be true')
|
||||
if $enable_v1 or $enable_v2 {
|
||||
warning('enable_v1 and enable_v2 parameters are deprecated and will be removed in Ocata.')
|
||||
}
|
||||
|
||||
case $device_driver {
|
||||
/\.haproxy/: {
|
||||
Package <| title == $::neutron::params::haproxy_package |> -> Package <| title == 'neutron-lbaas-agent' |>
|
||||
Package <| title == $::neutron::params::haproxy_package |> -> Package <| title == 'neutron-lbaasv2-agent' |>
|
||||
if $manage_haproxy_package {
|
||||
ensure_packages([$::neutron::params::haproxy_package])
|
||||
}
|
||||
|
@ -92,44 +97,23 @@ class neutron::agents::lbaas (
|
|||
'haproxy/user_group': value => $user_group;
|
||||
}
|
||||
|
||||
Package['neutron'] -> Package['neutron-lbaas-agent']
|
||||
ensure_resource( 'package', 'neutron-lbaas-agent', {
|
||||
ensure => $package_ensure,
|
||||
name => $::neutron::params::lbaas_agent_package,
|
||||
tag => ['openstack', 'neutron-package'],
|
||||
})
|
||||
if $::osfamily == 'Debian' {
|
||||
ensure_packages(['neutron-lbaasv2-package'], {
|
||||
Package['neutron'] -> Package['neutron-lbaasv2-agent']
|
||||
ensure_resource( 'package', 'neutron-lbaasv2-agent', {
|
||||
ensure => $package_ensure,
|
||||
name => $::neutron::params::lbaasv2_agent_package,
|
||||
tag => ['openstack', 'neutron-package'],
|
||||
})
|
||||
Package['neutron'] -> Package['neutron-lbaasv2-package']
|
||||
}
|
||||
if $manage_service {
|
||||
if $enable_v1 {
|
||||
$service_v1_ensure = 'running'
|
||||
$service_v2_ensure = 'stopped'
|
||||
} elsif $enable_v2 {
|
||||
$service_v1_ensure = 'stopped'
|
||||
$service_v2_ensure = 'running'
|
||||
} else {
|
||||
$service_v1_ensure = 'stopped'
|
||||
$service_v2_ensure = 'stopped'
|
||||
}
|
||||
}
|
||||
|
||||
service { 'neutron-lbaas-service':
|
||||
ensure => $service_v1_ensure,
|
||||
name => $::neutron::params::lbaas_agent_service,
|
||||
enable => $enable_v1,
|
||||
tag => 'neutron-service',
|
||||
if $manage_service {
|
||||
$service_ensure = 'running'
|
||||
} else {
|
||||
$service_ensure = 'stopped'
|
||||
}
|
||||
|
||||
service { 'neutron-lbaasv2-service':
|
||||
ensure => $service_v2_ensure,
|
||||
ensure => $service_ensure,
|
||||
name => $::neutron::params::lbaasv2_agent_service,
|
||||
enable => $enable_v2,
|
||||
enable => $enabled,
|
||||
tag => 'neutron-service',
|
||||
}
|
||||
}
|
||||
|
|
|
@ -58,10 +58,7 @@ class neutron::params {
|
|||
|
||||
$dnsmasq_packages = ['dnsmasq', 'dnsmasq-utils']
|
||||
|
||||
$lbaas_agent_package = 'openstack-neutron-lbaas'
|
||||
$lbaas_agent_service = 'neutron-lbaas-agent'
|
||||
|
||||
$lbaasv2_agent_package = false
|
||||
$lbaasv2_agent_package = 'openstack-neutron-lbaas'
|
||||
$lbaasv2_agent_service = 'neutron-lbaasv2-agent'
|
||||
|
||||
$haproxy_package = 'haproxy'
|
||||
|
@ -143,9 +140,6 @@ class neutron::params {
|
|||
$dhcp_agent_package = 'neutron-dhcp-agent'
|
||||
$dhcp_agent_service = 'neutron-dhcp-agent'
|
||||
|
||||
$lbaas_agent_package = 'neutron-lbaas-agent'
|
||||
$lbaas_agent_service = 'neutron-lbaas-agent'
|
||||
|
||||
$lbaasv2_agent_package = 'neutron-lbaasv2-agent'
|
||||
$lbaasv2_agent_service = 'neutron-lbaasv2-agent'
|
||||
|
||||
|
|
|
@ -374,9 +374,9 @@ class neutron::server (
|
|||
|
||||
if $ensure_lbaas_package {
|
||||
warning('$ensure_lbaas_package is deprecated. To install lbaas agent the neutron::agents::lbaas class should be used.')
|
||||
ensure_resource( 'package', 'neutron-lbaas-agent', {
|
||||
ensure_resource( 'package', 'neutron-lbaasv2-agent', {
|
||||
'ensure' => $package_ensure,
|
||||
'name' => $::neutron::params::lbaas_agent_package,
|
||||
'name' => $::neutron::params::lbaasv2_agent_package,
|
||||
'tag' => ['openstack', 'neutron-package'],
|
||||
})
|
||||
}
|
||||
|
|
|
@ -68,9 +68,9 @@ class neutron::services::lbaas (
|
|||
if $package_ensure {
|
||||
warning('Package ensure is deprecated. The neutron::agents::lbaas class should be used to install the agent')
|
||||
# agent package contains both agent and service resources
|
||||
ensure_resource( 'package', 'neutron-lbaas-agent', {
|
||||
ensure_resource( 'package', 'neutron-lbaasv2-agent', {
|
||||
ensure => $package_ensure,
|
||||
name => $::neutron::params::lbaas_agent_package,
|
||||
name => $::neutron::params::lbaasv2_agent_package,
|
||||
tag => ['openstack', 'neutron-package'],
|
||||
})
|
||||
}
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
---
|
||||
upgrade:
|
||||
- Switch-on lbaasv2 by default instead of lbaasv2 to follow what upstream Neutron is doing
|
||||
in https://review.openstack.org/286381 and also switch default device_driver to be
|
||||
neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver
|
||||
|
||||
deprecations:
|
||||
- enable_v1 and enable_v2 are deprecated in neutron::agents::lbaas.
|
||||
- LBaaS v1 deployment is not supported anymore.
|
|
@ -36,11 +36,7 @@ describe 'basic neutron' do
|
|||
allow_overlapping_ips => true,
|
||||
core_plugin => 'ml2',
|
||||
debug => true,
|
||||
service_plugins => [
|
||||
'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin',
|
||||
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin',
|
||||
'neutron.services.metering.metering_plugin.MeteringPlugin',
|
||||
],
|
||||
service_plugins => ['router', 'metering'],
|
||||
}
|
||||
class { '::neutron::db::mysql':
|
||||
password => 'a_big_secret',
|
||||
|
@ -59,7 +55,7 @@ describe 'basic neutron' do
|
|||
auth_url => 'http://127.0.0.1:35357/',
|
||||
sync_db => true,
|
||||
service_providers => [
|
||||
'LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',
|
||||
'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver'
|
||||
],
|
||||
}
|
||||
class { '::neutron::client': }
|
||||
|
|
|
@ -14,7 +14,7 @@ describe 'neutron::agents::lbaas' do
|
|||
{ :package_ensure => 'present',
|
||||
:enabled => true,
|
||||
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
|
||||
:device_driver => 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
|
||||
:device_driver => 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver',
|
||||
:manage_haproxy_package => true,
|
||||
:purge_config => false
|
||||
}
|
||||
|
@ -51,23 +51,23 @@ describe 'neutron::agents::lbaas' do
|
|||
end
|
||||
|
||||
it 'installs neutron lbaas agent package' do
|
||||
is_expected.to contain_package('neutron-lbaas-agent').with(
|
||||
is_expected.to contain_package('neutron-lbaasv2-agent').with(
|
||||
:name => platform_params[:lbaas_agent_package],
|
||||
:ensure => p[:package_ensure],
|
||||
:tag => ['openstack', 'neutron-package'],
|
||||
)
|
||||
is_expected.to contain_package('neutron').with_before(/Package\[neutron-lbaas-agent\]/)
|
||||
is_expected.to contain_package('neutron').with_before(/Package\[neutron-lbaasv2-agent\]/)
|
||||
end
|
||||
|
||||
it 'configures neutron lbaas agent service' do
|
||||
is_expected.to contain_service('neutron-lbaas-service').with(
|
||||
is_expected.to contain_service('neutron-lbaasv2-service').with(
|
||||
:name => platform_params[:lbaas_agent_service],
|
||||
:enable => true,
|
||||
:ensure => 'running',
|
||||
:tag => 'neutron-service',
|
||||
)
|
||||
is_expected.to contain_service('neutron-lbaas-service').that_subscribes_to('Anchor[neutron::service::begin]')
|
||||
is_expected.to contain_service('neutron-lbaas-service').that_notifies('Anchor[neutron::service::end]')
|
||||
is_expected.to contain_service('neutron-lbaasv2-service').that_subscribes_to('Anchor[neutron::service::begin]')
|
||||
is_expected.to contain_service('neutron-lbaasv2-service').that_notifies('Anchor[neutron::service::end]')
|
||||
end
|
||||
|
||||
context 'with manage_service as false' do
|
||||
|
@ -75,7 +75,9 @@ describe 'neutron::agents::lbaas' do
|
|||
params.merge!(:manage_service => false)
|
||||
end
|
||||
it 'should not start/stop service' do
|
||||
is_expected.to contain_service('neutron-lbaas-service').without_ensure
|
||||
is_expected.to contain_service('neutron-lbaasv2-service').with(
|
||||
:ensure => 'stopped',
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -83,7 +85,7 @@ describe 'neutron::agents::lbaas' do
|
|||
shared_examples_for 'haproxy lbaas_driver' do
|
||||
it 'installs haproxy packages' do
|
||||
if platform_params.has_key?(:lbaas_agent_package)
|
||||
is_expected.to contain_package(platform_params[:haproxy_package]).with_before(['Package[neutron-lbaas-agent]'])
|
||||
is_expected.to contain_package(platform_params[:haproxy_package]).with_before(['Package[neutron-lbaasv2-agent]'])
|
||||
end
|
||||
is_expected.to contain_package(platform_params[:haproxy_package]).with(
|
||||
:ensure => 'present'
|
||||
|
@ -119,9 +121,9 @@ describe 'neutron::agents::lbaas' do
|
|||
|
||||
let :platform_params do
|
||||
{ :haproxy_package => 'haproxy',
|
||||
:lbaas_agent_package => 'neutron-lbaas-agent',
|
||||
:lbaas_agent_package => 'neutron-lbaasv2-agent',
|
||||
:nobody_user_group => 'nogroup',
|
||||
:lbaas_agent_service => 'neutron-lbaas-agent' }
|
||||
:lbaas_agent_service => 'neutron-lbaasv2-agent' }
|
||||
end
|
||||
|
||||
it_configures 'neutron lbaas agent'
|
||||
|
@ -141,7 +143,7 @@ describe 'neutron::agents::lbaas' do
|
|||
{ :haproxy_package => 'haproxy',
|
||||
:lbaas_agent_package => 'openstack-neutron-lbaas',
|
||||
:nobody_user_group => 'nobody',
|
||||
:lbaas_agent_service => 'neutron-lbaas-agent' }
|
||||
:lbaas_agent_service => 'neutron-lbaasv2-agent' }
|
||||
end
|
||||
|
||||
it_configures 'neutron lbaas agent'
|
||||
|
|
|
@ -254,7 +254,7 @@ describe 'neutron::server' do
|
|||
)
|
||||
end
|
||||
it 'should install *aaS packages' do
|
||||
is_expected.to contain_package('neutron-lbaas-agent')
|
||||
is_expected.to contain_package('neutron-lbaasv2-agent')
|
||||
is_expected.to contain_package('neutron-fwaas')
|
||||
is_expected.to contain_package('neutron-vpnaas-agent')
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue