From a3f46348de08eda958e91ab093d7d5a857be50f7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 3 Mar 2022 22:03:43 +0900 Subject: [PATCH] Remove deprecated *_client_api_version parameters ... because these were deprecated during Xena cycle[1]. [1] 8118ce9a4bd3c9ba942a69fd348f9d6ec133b3d0 Change-Id: I29d2b3419ccfcae7644122fce8455cc552890d1a --- manifests/cinder_client.pp | 4 +- manifests/glance_client.pp | 4 +- manifests/init.pp | 56 ------------------- manifests/neutron_client.pp | 4 +- manifests/nova_client.pp | 4 +- ...p-client_api_version-905613eeea94283f.yaml | 4 ++ 6 files changed, 8 insertions(+), 68 deletions(-) create mode 100644 releasenotes/notes/cleanup-client_api_version-905613eeea94283f.yaml diff --git a/manifests/cinder_client.pp b/manifests/cinder_client.pp index e48d1af..c415c62 100644 --- a/manifests/cinder_client.pp +++ b/manifests/cinder_client.pp @@ -26,10 +26,8 @@ class watcher::cinder_client ( include watcher::deps include watcher::params - $api_version_real = pick($::watcher::cinder_client_api_version, $api_version) - 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/region_name': value => $region_name; } diff --git a/manifests/glance_client.pp b/manifests/glance_client.pp index 6a5d865..146a6b6 100644 --- a/manifests/glance_client.pp +++ b/manifests/glance_client.pp @@ -26,10 +26,8 @@ class watcher::glance_client ( include watcher::deps include watcher::params - $api_version_real = pick($::watcher::glance_client_api_version, $api_version) - 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/region_name': value => $region_name; } diff --git a/manifests/init.pp b/manifests/init.pp index 5c1eed7..8f5717a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -208,28 +208,6 @@ # in the watcher config. # 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 # # Daniel Pawlik @@ -280,12 +258,6 @@ class watcher ( $notification_transport_url = $::os_service_default, $notification_driver = $::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 @@ -295,34 +267,6 @@ class watcher ( include watcher::policy 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': ensure => $package_ensure, name => $::watcher::params::common_package_name, diff --git a/manifests/neutron_client.pp b/manifests/neutron_client.pp index 8354d4a..a145551 100644 --- a/manifests/neutron_client.pp +++ b/manifests/neutron_client.pp @@ -26,10 +26,8 @@ class watcher::neutron_client ( include watcher::deps include watcher::params - $api_version_real = pick($::watcher::neutron_client_api_version, $api_version) - 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/region_name': value => $region_name; } diff --git a/manifests/nova_client.pp b/manifests/nova_client.pp index 21d5c05..c4dbbc6 100644 --- a/manifests/nova_client.pp +++ b/manifests/nova_client.pp @@ -26,10 +26,8 @@ class watcher::nova_client ( include watcher::deps include watcher::params - $api_version_real = pick($::watcher::nova_client_api_version, $api_version) - 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/region_name': value => $region_name; } diff --git a/releasenotes/notes/cleanup-client_api_version-905613eeea94283f.yaml b/releasenotes/notes/cleanup-client_api_version-905613eeea94283f.yaml new file mode 100644 index 0000000..fce0abc --- /dev/null +++ b/releasenotes/notes/cleanup-client_api_version-905613eeea94283f.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``watcher::_client_api_version`` parameters have been removed.