Remove deprecated ensure_package option
Change-Id: If45fc4c3aeb97520d7b430cf6529fd453a1a324c
This commit is contained in:
parent
3ee646a7e0
commit
1f3ee8eccb
|
@ -176,10 +176,6 @@
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
# [*ensure_package*]
|
|
||||||
# (optional) The state of aodh packages
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*rpc_backend*]
|
# [*rpc_backend*]
|
||||||
# (optional) The rpc backend implementation to use, can be:
|
# (optional) The rpc backend implementation to use, can be:
|
||||||
# amqp (for AMQP 1.0 protocol)
|
# amqp (for AMQP 1.0 protocol)
|
||||||
|
@ -226,27 +222,18 @@ class octavia (
|
||||||
$topic = 'octavia-rpc',
|
$topic = 'octavia-rpc',
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$ensure_package = undef,
|
|
||||||
$rpc_backend = 'rabbit',
|
$rpc_backend = 'rabbit',
|
||||||
) inherits octavia::params {
|
) inherits octavia::params {
|
||||||
|
|
||||||
include ::octavia::deps
|
include ::octavia::deps
|
||||||
include ::octavia::logging
|
include ::octavia::logging
|
||||||
|
|
||||||
if $ensure_package {
|
|
||||||
warning("octavia::ensure_package is deprecated and will be removed in \
|
|
||||||
the future release. Please use octavia::package_ensure instead.")
|
|
||||||
$package_ensure_real = $ensure_package
|
|
||||||
} else {
|
|
||||||
$package_ensure_real = $package_ensure
|
|
||||||
}
|
|
||||||
|
|
||||||
if $rpc_backend {
|
if $rpc_backend {
|
||||||
warning('The rpc_backend parameter has been deprecated, please use default_transport_url instead.')
|
warning('The rpc_backend parameter has been deprecated, please use default_transport_url instead.')
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'octavia':
|
package { 'octavia':
|
||||||
ensure => $package_ensure_real,
|
ensure => $package_ensure,
|
||||||
name => $::octavia::params::common_package_name,
|
name => $::octavia::params::common_package_name,
|
||||||
tag => ['openstack', 'octavia-package'],
|
tag => ['openstack', 'octavia-package'],
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- Deprecated ensure_package option has been removed.
|
Loading…
Reference in New Issue