From 9d6f124480d2a43482a24e0e3f467f2473c07bf2 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sat, 19 May 2018 23:58:20 +0200 Subject: [PATCH] Remove deprecated parameters Removes deprecated parameters that has been deprecated for one cycle or more. Change-Id: Ie56580c1f1980ed52bb2d390143767c416c4ba19 --- manifests/api.pp | 59 ------------------- ...an-remove-deprecated-325f3a73e4f58e7b.yaml | 9 +++ spec/classes/barbican_api_spec.rb | 16 ----- 3 files changed, 9 insertions(+), 75 deletions(-) create mode 100644 releasenotes/notes/barbican-remove-deprecated-325f3a73e4f58e7b.yaml diff --git a/manifests/api.pp b/manifests/api.pp index deddb1fb..462bcbe0 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -237,38 +237,6 @@ # HTTPProxyToWSGI middleware. # Defaults to $::os_service_default. # -# === DEPRECATED PARAMETERS -# -# [*rabbit_host*] -# (optional) Location of rabbitmq installation. -# Defaults to $::os_service_default -# -# [*rabbit_hosts*] -# (optional) List of clustered rabbit servers. -# Defaults to $::os_service_default -# -# [*rabbit_port*] -# (optional) Port for rabbitmq instance. -# Defaults to $::os_service_default -# -# [*rabbit_password*] -# (optional) Password used to connect to rabbitmq. -# Defaults to $::os_service_default -# -# [*rabbit_userid*] -# (optional) User used to connect to rabbitmq. -# Defaults to $::os_service_default -# -# [*rabbit_virtual_host*] -# (optional) The RabbitMQ virtual host. -# Defaults to $::os_service_default -# -# [*rpc_backend*] -# (optional) The rpc backend implementation to use, can be: -# rabbit (for rabbitmq) -# zmq (for zeromq) -# Defaults to $::os_service_default -# class barbican::api ( $package_ensure = 'present', $client_package_ensure = 'present', @@ -319,35 +287,14 @@ class barbican::api ( $key_file = $::os_service_default, $service_name = 'barbican-api', $enable_proxy_headers_parsing = $::os_service_default, - # DEPRECATED - $rabbit_host = $::os_service_default, - $rabbit_hosts = $::os_service_default, - $rabbit_password = $::os_service_default, - $rabbit_port = $::os_service_default, - $rabbit_userid = $::os_service_default, - $rabbit_virtual_host = $::os_service_default, - $rpc_backend = $::os_service_default, ) inherits barbican::params { - include ::barbican::deps include ::barbican::db include ::barbican::api::logging include ::barbican::client include ::barbican::policy - if !is_service_default($rabbit_host) or - !is_service_default($rabbit_hosts) or - !is_service_default($rabbit_password) or - !is_service_default($rabbit_port) or - !is_service_default($rabbit_userid) or - !is_service_default($rabbit_virtual_host) or - !is_service_default($rpc_backend) { - warning("barbican::api::rabbit_host, barbican::api::rabbit_hosts, barbican::api::rabbit_password, \ -barbican::api::rabbit_port, barbican::api::rabbit_userid, barbican::api::rabbit_virtual_host and \ -barbican::rpc_backend are deprecated. Please use barbican::api::default_transport_url instead.") - } - # TODO: Remove the posix users and permissions and merge this definition # with the previous one, once the barbican package has been updated # with the correct ownership for this directory. @@ -380,9 +327,6 @@ barbican::rpc_backend are deprecated. Please use barbican::api::default_transpor } oslo::messaging::rabbit {'barbican_config': - rabbit_password => $rabbit_password, - rabbit_userid => $rabbit_userid, - rabbit_virtual_host => $rabbit_virtual_host, rabbit_use_ssl => $rabbit_use_ssl, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_rate => $rabbit_heartbeat_rate, @@ -394,9 +338,6 @@ barbican::rpc_backend are deprecated. Please use barbican::api::default_transpor kombu_ssl_certfile => $kombu_ssl_certfile, kombu_ssl_keyfile => $kombu_ssl_keyfile, kombu_ssl_version => $kombu_ssl_version, - rabbit_hosts => $rabbit_hosts, - rabbit_host => $rabbit_host, - rabbit_port => $rabbit_port, rabbit_ha_queues => $rabbit_ha_queues, } diff --git a/releasenotes/notes/barbican-remove-deprecated-325f3a73e4f58e7b.yaml b/releasenotes/notes/barbican-remove-deprecated-325f3a73e4f58e7b.yaml new file mode 100644 index 00000000..736ab841 --- /dev/null +++ b/releasenotes/notes/barbican-remove-deprecated-325f3a73e4f58e7b.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The deprecated parameters barbican::api::rabbit_host, barbican::api::rabbit_hosts, + barbican::api::rabbit_password, barbican::api::rabbit_port, barbican::api::rabbit_userid + and barbican::api::rabbit_virtual_host is removed. + Please use barbican::api::default_transport_url. + - | + The deprecated parameter barbican::api::rpc_backend is removed. diff --git a/spec/classes/barbican_api_spec.rb b/spec/classes/barbican_api_spec.rb index 8870b7cf..e49cc330 100644 --- a/spec/classes/barbican_api_spec.rb +++ b/spec/classes/barbican_api_spec.rb @@ -33,12 +33,6 @@ describe 'barbican::api' do :notification_transport_url => '', :notification_driver => '', :notification_topics => '', - :rabbit_host => '', - :rabbit_hosts => [''], - :rabbit_password => '', - :rabbit_port => '', - :rabbit_userid => '', - :rabbit_virtual_host => '', :rabbit_use_ssl => '', :rabbit_heartbeat_timeout_threshold => '', :rabbit_heartbeat_rate => '', @@ -82,12 +76,6 @@ describe 'barbican::api' do :notification_transport_url => 'rabbit://bugs:bugs_bunny@localhost:1234/rabbithost', :notification_driver => 'kombu', :notification_topics => 'notifications', - :rabbit_host => 'rabbithost', - :rabbit_hosts => ['rabbithost:1234'], - :rabbit_password => 'bugs_bunny', - :rabbit_port => '1234', - :rabbit_userid => 'bugs', - :rabbit_virtual_host => 'rabbithost', :rabbit_use_ssl => true, :rabbit_heartbeat_timeout_threshold => '10', :rabbit_heartbeat_rate => '10', @@ -172,10 +160,6 @@ describe 'barbican::api' do is_expected.to contain_barbican_config('oslo_messaging_notifications/transport_url').with_value(param_hash[:notification_transport_url]) is_expected.to contain_barbican_config('oslo_messaging_notifications/driver').with_value(param_hash[:notification_driver]) is_expected.to contain_barbican_config('oslo_messaging_notifications/topics').with_value(param_hash[:notification_topics]) - is_expected.to contain_barbican_config('oslo_messaging_rabbit/rabbit_hosts').with_value(param_hash[:rabbit_hosts]) - is_expected.to contain_barbican_config('oslo_messaging_rabbit/rabbit_password').with_value(param_hash[:rabbit_password]).with_secret(true) - is_expected.to contain_barbican_config('oslo_messaging_rabbit/rabbit_userid').with_value(param_hash[:rabbit_userid]) - is_expected.to contain_barbican_config('oslo_messaging_rabbit/rabbit_virtual_host').with_value(param_hash[:rabbit_virtual_host]) is_expected.to contain_barbican_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value(param_hash[:rabbit_heartbeat_timeout_threshold]) is_expected.to contain_barbican_config('oslo_messaging_rabbit/heartbeat_rate').with_value(param_hash[:rabbit_heartbeat_rate]) is_expected.to contain_oslo__messaging__rabbit('barbican_config').with(