openstack/puppet-watcher
Code Issues Proposed changes

Remove deprecated *_client_api_version parameters

Browse Source 
... because these were deprecated during Xena cycle[1].

[1] 8118ce9a4bd3c9ba942a69fd348f9d6ec133b3d0

Change-Id: I29d2b3419ccfcae7644122fce8455cc552890d1a
This commit is contained in:
Takashi Kajinami 2022-03-03 22:03:43 +09:00
parent e283d40478
commit a3f46348de
6 changed files with 8 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cinder_client.pp
View File

@ -26,10 +26,8 @@ class watcher::cinder_client (
include watcher::deps include watcher::deps
include watcher::params include watcher::params
$api_version_real = pick($::watcher::cinder_client_api_version, $api_version)
watcher_config { watcher_config {
'cinder_client/api_version': value => $api_version_real; 'cinder_client/api_version': value => $api_version;
'cinder_client/endpoint_type': value => $endpoint_type; 'cinder_client/endpoint_type': value => $endpoint_type;
'cinder_client/region_name': value => $region_name; 'cinder_client/region_name': value => $region_name;
} }

4
manifests/glance_client.pp
View File

@ -26,10 +26,8 @@ class watcher::glance_client (
include watcher::deps include watcher::deps
include watcher::params include watcher::params
$api_version_real = pick($::watcher::glance_client_api_version, $api_version)
watcher_config { watcher_config {
'glance_client/api_version': value => $api_version_real; 'glance_client/api_version': value => $api_version;
'glance_client/endpoint_type': value => $endpoint_type; 'glance_client/endpoint_type': value => $endpoint_type;
'glance_client/region_name': value => $region_name; 'glance_client/region_name': value => $region_name;
} }

56
manifests/init.pp
View File

@ -208,28 +208,6 @@
# in the watcher config. # in the watcher config.
# Defaults to false. # Defaults to false.
# #
# DEPRECATED PARAMETERS
#
# [*ceilometer_client_api_version*]
# (required) Version of Ceilometer API to use in ceilometerclient.
# Default is undef
#
# [*cinder_client_api_version*]
# (required) Version of Cinder API to use in cinderclient.
# Default is $::os_service_default.
#
# [*glance_client_api_version*]
# (required) Version of Glance API to use in glanceclient.
# Default is $::os_service_default.
#
# [*neutron_client_api_version*]
# (required) Version of Neutron API to use in neutronclient.
# Default is $::os_service_default.
#
# [*nova_client_api_version*]
# (required) Version of Nova API to use in novaclient.
# Default is $::os_service_default
#
# === Authors # === Authors
# #
# Daniel Pawlik <daniel.pawlik@corp.ovh.com> # Daniel Pawlik <daniel.pawlik@corp.ovh.com>
@ -280,12 +258,6 @@ class watcher (
$notification_transport_url = $::os_service_default, $notification_transport_url = $::os_service_default,
$notification_driver = $::os_service_default, $notification_driver = $::os_service_default,
$notification_topics = $::os_service_default, $notification_topics = $::os_service_default,
# DEPRECATED PARAMETERS
$ceilometer_client_api_version = undef,
$cinder_client_api_version = undef,
$glance_client_api_version = undef,
$neutron_client_api_version = undef,
$nova_client_api_version = undef,
) { ) {
include openstacklib::openstackclient include openstacklib::openstackclient
@ -295,34 +267,6 @@ class watcher (
include watcher::policy include watcher::policy
include watcher::db include watcher::db
if $ceilometer_client_api_version != undef {
warning('The ceilometer_client_api_version parameter is deprecated and has no effect')
}
if $cinder_client_api_version != undef {
warning('The cinder_client_api_version parameter is deprecated. \
Use the watcher::cinder_client class instead')
include watcher::cinder_client
}
if $glance_client_api_version != undef {
warning('The glance_client_api_version parameter is deprecated. \
Use the watcher::glance_client class instead')
include watcher::glance_client
}
if $neutron_client_api_version != undef {
warning('The neutron_client_api_version parameter is deprecated. \
Use the watcher::neutron_client class instead')
include watcher::neutron_client
}
if $nova_client_api_version != undef {
warning('The nova_client_api_version parameter is deprecated. \
Use the watcher::nova_client class instead')
include watcher::nova_client
}
package { 'watcher': package { 'watcher':
ensure => $package_ensure, ensure => $package_ensure,
name => $::watcher::params::common_package_name, name => $::watcher::params::common_package_name,

4
manifests/neutron_client.pp
View File

@ -26,10 +26,8 @@ class watcher::neutron_client (
include watcher::deps include watcher::deps
include watcher::params include watcher::params
$api_version_real = pick($::watcher::neutron_client_api_version, $api_version)
watcher_config { watcher_config {
'neutron_client/api_version': value => $api_version_real; 'neutron_client/api_version': value => $api_version;
'neutron_client/endpoint_type': value => $endpoint_type; 'neutron_client/endpoint_type': value => $endpoint_type;
'neutron_client/region_name': value => $region_name; 'neutron_client/region_name': value => $region_name;
} }

4
manifests/nova_client.pp
View File

@ -26,10 +26,8 @@ class watcher::nova_client (
include watcher::deps include watcher::deps
include watcher::params include watcher::params
$api_version_real = pick($::watcher::nova_client_api_version, $api_version)
watcher_config { watcher_config {
'nova_client/api_version': value => $api_version_real; 'nova_client/api_version': value => $api_version;
'nova_client/endpoint_type': value => $endpoint_type; 'nova_client/endpoint_type': value => $endpoint_type;
'nova_client/region_name': value => $region_name; 'nova_client/region_name': value => $region_name;
} }

4
releasenotes/notes/cleanup-client_api_version-905613eeea94283f.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``watcher::<service>_client_api_version`` parameters have been removed.