openstack
/
puppet-murano
Code Issues Proposed changes

Remove deprecated parameters 

Removes deprecated parameters that has been
deprecated for one cycle or more.

Change-Id: Ib9773ebe2771f41bcc9ada3805865a93794706b5
This commit is contained in:
Tobias Urdin 2018-06-13 22:22:19 +02:00
parent 908f661ca5
commit c779e5d878
3 changed files with 6 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
manifests/init.pp
View File

@ -267,30 +267,6 @@
# (Optional) Admin identity endpoint
# Defaults to 'http://127.0.0.1:5000/'
#
# [*rabbit_os_host*]
# (Optional) Host for openstack rabbit server
# Defaults to $::os_service_default
#
# [*rabbit_os_hosts*]
# (Optional) Hosts for openstack rabbit server
# Defaults to $::os_service_default
#
# [*rabbit_os_port*]
# (Optional) Port for openstack rabbit server
# Defaults to $::os_service_default
#
# [*rabbit_os_user*]
# (Optional) Username for openstack rabbit server
# Defaults to 'guest'
#
# [*rabbit_os_password*]
# (Optional) Password for openstack rabbit server
# Defaults to 'guest'
#
# [*rabbit_os_virtual_host*]
# (optional) The RabbitMQ virtual host.
# Defaults to $::os_service_default
#
class murano(
$admin_password,
$package_ensure = 'present',
@ -353,12 +329,6 @@ class murano(
$amqp_durable_queues = $::os_service_default,
# Deprecated
$identity_uri = 'http://127.0.0.1:5000/',
$rabbit_os_host = $::os_service_default,
$rabbit_os_port = $::os_service_default,
$rabbit_os_hosts = $::os_service_default,
$rabbit_os_virtual_host = $::os_service_default,
$rabbit_os_user = 'guest',
$rabbit_os_password = 'guest',
) inherits murano::params {
include ::murano::deps
@ -368,17 +338,6 @@ class murano(
validate_string($admin_password)
if !is_service_default($rabbit_os_host) or
!is_service_default($rabbit_os_hosts) or
!is_service_default($rabbit_os_password) or
!is_service_default($rabbit_os_port) or
!is_service_default($rabbit_os_user) or
!is_service_default($rabbit_os_virtual_host) {
warning("murano::rabbit_os_host, murano::rabbit_os_hosts, murano::rabbit_os_password, \
murano::rabbit_os_port, murano::rabbit_os_userid and murano::rabbit_os_virtual_host are \
deprecated. Please use murano::default_transport_url instead.")
}
package { 'murano-common':
ensure => $package_ensure,
name => $::murano::params::common_package_name,
@ -472,14 +431,8 @@ deprecated. Please use murano::default_transport_url instead.")
kombu_reconnect_delay => $kombu_reconnect_delay,
kombu_failover_strategy => $kombu_failover_strategy,
kombu_compression => $kombu_compression,
rabbit_host => $rabbit_os_host,
rabbit_port => $rabbit_os_port,
rabbit_hosts => $rabbit_os_hosts,
rabbit_use_ssl => $rabbit_os_use_ssl,
rabbit_userid => $rabbit_os_user,
rabbit_password => $rabbit_os_password,
rabbit_ha_queues => $rabbit_ha_queues,
rabbit_virtual_host => $rabbit_os_virtual_host,
amqp_durable_queues => $amqp_durable_queues,
}

6
releasenotes/notes/remote-deprecated-rabbit-a8e5c93bdc9dac4d.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The deprecated parameters rabbit_os_host, rabbit_os_hosts, rabbit_os_password,
rabbit_os_port, rabbit_os_userid and rabbit_os_virtual_host in ::murano has been removed.
Please use the murano::default_transport_url parameter instead.

14
spec/classes/murano_init_spec.rb
View File

@ -42,16 +42,10 @@ describe 'murano' do
it { is_expected.to contain_murano_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_password').with_value('guest') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_hosts').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_host').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_port').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_oslo__messaging__rabbit('murano_config').with(
:rabbit_use_ssl => '<SERVICE DEFAULT>',
) }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_virtual_host').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/kombu_compression').with_value('<SERVICE DEFAULT>') }
@ -93,10 +87,6 @@ describe 'murano' do
:default_transport_url => 'rabbit://user:pass@host:1234/virt',
:rpc_response_timeout => '120',
:control_exchange => 'murano',
:rabbit_os_host => '10.255.0.1',
:rabbit_os_port => '5673',
:rabbit_os_user => 'os',
:rabbit_os_password => 'ossecrete',
:rabbit_ha_queues => true,
:rabbit_os_use_ssl => true,
:amqp_durable_queues => true,
@ -154,10 +144,6 @@ describe 'murano' do
it { is_expected.to contain_murano_config('DEFAULT/transport_url').with_value('rabbit://user:pass@host:1234/virt') }
it { is_expected.to contain_murano_config('DEFAULT/rpc_response_timeout').with_value('120') }
it { is_expected.to contain_murano_config('DEFAULT/control_exchange').with_value('murano') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_userid').with_value('os') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_password').with_value('ossecrete') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_host').with_value('10.255.0.1') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_port').with_value('5673') }
it { is_expected.to contain_murano_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) }
it { is_expected.to contain_oslo__messaging__rabbit('murano_config').with(
:rabbit_use_ssl => true,