openstack
/
puppet-murano
Code Issues Proposed changes

Deprecate rabbitmq connection parameters 

The rabbitmq connection parameters have been deprecated in favor of the
transport_url setting.

Change-Id: Ie63457370ae37ef5af5878b1a97b8bafa80a8189
Related-Bug: #1625198
This commit is contained in:
Alex Schultz 2016-11-08 15:01:34 -07:00
parent 56d185d6f2
commit e97cfb463a
4 changed files with 60 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
manifests/init.pp
View File

@ -36,26 +36,11 @@
# (Optional) Notification driver to use
# Defaults to 'messagingv2'
#
# [*rabbit_os_host*]
# (Optional) Host for openstack rabbit server
# [*default_transport_url*]
# (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# 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_ha_queues*]
# (Optional) Should murano api use ha queues
# Defaults to $::os_service_default
@ -64,10 +49,6 @@
# (Optional) Connect over SSL for openstack RabbitMQ.
# Defaults to $::os_service_default.
#
# [*rabbit_os_virtual_host*]
# (optional) The RabbitMQ virtual host.
# Defaults to $::os_service_default
#
# [*kombu_ssl_ca_certs*]
# (optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to $::os_service_default
@ -252,6 +233,30 @@
# (Optional) Admin identity endpoint
# Defaults to 'http://127.0.0.1:35357/'
#
# [*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',
@ -262,13 +267,8 @@ class murano(
$log_dir = undef,
$data_dir = '/var/cache/murano',
$notification_driver = 'messagingv2',
$rabbit_os_host = $::os_service_default,
$rabbit_os_port = $::os_service_default,
$rabbit_os_hosts = $::os_service_default,
$rabbit_os_user = 'guest',
$rabbit_os_password = 'guest',
$default_transport_url = $::os_service_default,
$rabbit_os_use_ssl = $::os_service_default,
$rabbit_os_virtual_host = $::os_service_default,
$kombu_ssl_ca_certs = $::os_service_default,
$kombu_ssl_certfile = $::os_service_default,
$kombu_ssl_keyfile = $::os_service_default,
@ -312,6 +312,12 @@ class murano(
$purge_config = false,
# Deprecated
$identity_uri = 'http://127.0.0.1:35357/',
$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',
) {
include ::murano::params
@ -321,6 +327,17 @@ 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,
@ -414,6 +431,10 @@ class murano(
rabbit_virtual_host => $rabbit_os_virtual_host,
}
oslo::messaging::default { 'murano_config':
transport_url => $default_transport_url,
}
oslo::messaging::notifications { 'murano_config':
driver => $notification_driver,
}

6
releasenotes/notes/rabbit-connection-params-deprecation-776dbae440e204ba.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- 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.
murano::default_transport_url should be used instead.

3
spec/acceptance/basic_murano_spec.rb
View File

@ -46,8 +46,7 @@ describe 'basic murano' do
}
class { '::murano':
admin_password => 'a_big_secret',
rabbit_os_user => 'murano',
rabbit_os_password => 'an_even_bigger_secret',
default_transport_url => 'rabbit://murano:an_even_bigger_secret@127.0.0.1:5672/',
rabbit_own_user => 'murano',
rabbit_own_password => 'an_even_bigger_secret',
rabbit_own_vhost => '/murano',

3
spec/classes/murano_init_spec.rb
View File

@ -34,6 +34,7 @@ describe 'murano' do
it { is_expected.to contain_murano_config('engine/use_trusts').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('DEFAULT/transport_url').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>') }
@ -74,6 +75,7 @@ describe 'murano' do
:admin_password => 'secrete',
:package_ensure => 'latest',
:notification_driver => 'messagingv1',
:default_transport_url => 'rabbit://user:pass@host:1234/virt',
:rabbit_os_host => '10.255.0.1',
:rabbit_os_port => '5673',
:rabbit_os_user => 'os',
@ -127,6 +129,7 @@ describe 'murano' do
it { is_expected.to contain_murano_config('engine/use_trusts').with_value(true) }
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('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') }