openstack/puppet-neutron
Code Issues Proposed changes

Merge "Remove deprecated enable_v1 and enable_v2 options"

Browse Source
This commit is contained in:
Jenkins 2017-01-04 20:43:33 +00:00 committed by Gerrit Code Review
commit e6bdd7ec25
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/agents/lbaas.pp
View File

@ -37,18 +37,6 @@
# in the lbaas config.
# Defaults to false.
#
# DEPRECATED PARAMETERS
#
# [*enable_v1*]
# (optional) Whether to use lbaas v1 agent or not.
# Deprecated. Will be removed in Ocata.
# Defaults to undef
#
# [*enable_v2*]
# (optional) Whether to use lbaas v2 agent or not.
# Deprecated. Will be removed in Ocata.
# Defaults to undef
#
class neutron::agents::lbaas (
$package_ensure = present,
$enabled = true,
@ -59,18 +47,11 @@ class neutron::agents::lbaas (
$user_group = $::neutron::params::nobody_user_group,
$manage_haproxy_package = true,
$purge_config = false,
# DEPRECATED PARAMETERS
$enable_v1 = undef,
$enable_v2 = undef,
) {
include ::neutron::deps
include ::neutron::params
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-lbaasv2-agent' |>

4
releasenotes/notes/remove_deprecated_lbaas_v1_v2-options-712e1981e4514f28.yaml Normal file
View File

@ -0,0 +1,4 @@
---
other:
- Removed deprecated neutron::agent::lbaas::enable_v1
- Removed deprecated neutron::agent::lbaas::enable_v2