openstack/puppet-trove
Code Issues Proposed changes

Remove deprecated ensure_package option

Browse Source 
Change-Id: I4d667ea525c9b7a48d8175b37c1cdfb55543ed39
This commit is contained in:
ZhongShengping 2018-03-29 12:01:15 +08:00
parent ed21e2b1f3
commit 2a99e642d8
6 changed files with 8 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/api.pp
View File

@ -120,12 +120,6 @@
# (optional) Message queue name the Taskmanager will listen to.
# Defaults to 'taskmanager'.
#
# DEPRECATED PARAMETERS
#
# [*ensure_package*]
# (optional) Whether the trove api package will be installed
# Defaults to undef
#
class trove::api(
$debug = undef,
$log_file = undef,
@ -151,8 +145,6 @@ class trove::api(
$package_ensure = 'present',
$auth_strategy = 'keystone',
$taskmanager_queue = 'taskmanager',
# DEPRECATED PARAMETERS
$ensure_package = undef,
) inherits trove {
include ::trove::deps
@ -161,14 +153,6 @@ class trove::api(
include ::trove::logging
include ::trove::params
if $ensure_package {
warning("trove::api::ensure_package is deprecated and will be removed in \
the future release. Please use trove::api::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
# basic service config
trove_config {
'DEFAULT/bind_host': value => $bind_host;
@ -343,7 +327,7 @@ the future release. Please use trove::api::package_ensure instead.")
trove::generic_service { 'api':
enabled => $enabled,
manage_service => $manage_service,
package_ensure => $package_ensure_real,
package_ensure => $package_ensure,
package_name => $::trove::params::api_package_name,
service_name => $::trove::params::api_service_name,
}

18
manifests/conductor.pp
View File

@ -58,12 +58,6 @@
# (optional) If False doesn't trace SQL requests.
# Default: $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*ensure_package*]
# (optional) The state of the trove conductor package
# Defaults to undef
#
class trove::conductor(
$enabled = true,
$manage_service = true,
@ -78,21 +72,11 @@ class trove::conductor(
$workers = $::os_workers,
$enable_profiler = $::os_service_default,
$trace_sqlalchemy = $::os_service_default,
# DEPRECATED PARAMETERS
$ensure_package = undef,
) inherits trove {
include ::trove::deps
include ::trove::params
if $ensure_package {
warning("trove::conductor::ensure_package is deprecated and will be removed in \
the future release. Please use trove::conductor::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
if $::trove::database_connection {
if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) {
require '::mysql::bindings'
@ -202,7 +186,7 @@ the future release. Please use trove::conductor::package_ensure instead.")
manage_service => $manage_service,
package_name => $::trove::params::conductor_package_name,
service_name => $::trove::params::conductor_service_name,
package_ensure => $package_ensure_real,
package_ensure => $package_ensure,
}
}

18
manifests/generic_service.pp
View File

@ -47,20 +47,12 @@
# (optional) Control the ensure parameter for the package ressource.
# Defaults to 'present'.
#
# DEPRECATED PARAMETERS
#
# [*ensure_package*]
# (optional) Control the ensure parameter for the package ressource.
# Defaults to undef.
#
define trove::generic_service(
$package_name,
$service_name,
$enabled = false,
$manage_service = true,
$package_ensure = 'present',
# DEPRECATED PARAMETERS
$ensure_package = undef
) {
include ::trove::deps
@ -68,18 +60,10 @@ define trove::generic_service(
$trove_title = "trove-${name}"
if $ensure_package {
warning("trove::generic_service::ensure_package is deprecated and will be removed \
in the future release. Please use trove::generic_service::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
if ($package_name) {
if !defined(Package[$package_name]) {
package { $trove_title:
ensure => $package_ensure_real,
ensure => $package_ensure,
name => $package_name,
tag => ['openstack', 'trove-package'],
}

15
manifests/guestagent.pp
View File

@ -107,10 +107,6 @@
# guests need to talk to the rabbit cluster via
# a different port.
#
# [*ensure_package*]
# (optional) The state of the trove guest agent package
# Defaults to undef
#
class trove::guestagent(
$enabled = true,
$manage_service = true,
@ -134,7 +130,6 @@ class trove::guestagent(
$rabbit_hosts = $::trove::rabbit_hosts,
$rabbit_host = $::trove::rabbit_host,
$rabbit_port = $::trove::rabbit_port,
$ensure_package = undef,
) inherits trove {
include ::trove::deps
@ -148,14 +143,6 @@ and trove::guestagent::rabbit_port are deprecated. Please use \
trove::guestagent::default_transport_url instead.")
}
if $ensure_package {
warning("trove::guestagent::ensure_package is deprecated and will be removed \
in the future release. Please use trove::guestagent::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
if $control_exchange {
warning("control_exchange parameter is deprecated. Please use \
trove::control_exchange instead.")
@ -244,7 +231,7 @@ trove::control_exchange instead.")
manage_service => $manage_service,
package_name => $::trove::params::guestagent_package_name,
service_name => $::trove::params::guestagent_service_name,
package_ensure => $package_ensure_real,
package_ensure => $package_ensure,
}
}

15
manifests/taskmanager.pp
View File

@ -86,10 +86,6 @@
# (optional) Use template to provision trove guest agent configuration file.
# Defaults to true.
#
# [*ensure_package*]
# (optional) The state of the trove taskmanager package
# Defaults to undef
#
class trove::taskmanager(
$enabled = true,
$manage_service = true,
@ -107,20 +103,11 @@ class trove::taskmanager(
$default_neutron_networks = undef,
$taskmanager_queue = undef,
$use_guestagent_template = true,
$ensure_package = undef,
) inherits trove {
include ::trove::deps
include ::trove::params
if $ensure_package {
warning("trove::taskmanager::ensure_package is deprecated and will be removed in \
the future release. Please use trove::taskmanager::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
if $default_neutron_networks {
warning("trove::taskmanager::default_neutron_networks is deprecated and will be removed in \
the future release. Please use trove::default_neutron_networks instead.")
@ -277,7 +264,7 @@ the future release. Please use trove::default_neutron_networks instead.")
manage_service => $manage_service,
package_name => $::trove::params::taskmanager_package_name,
service_name => $::trove::params::taskmanager_service_name,
package_ensure => $package_ensure_real,
package_ensure => $package_ensure,
}
if $guestagent_config_file {

3
releasenotes/notes/remove_deprecated_ensure_package_option-a4088afe0b345a44.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Deprecated ensure_package option has been removed.