openstack/puppet-magnum
Code Issues Proposed changes

Merge "Use oslo module for messaging (rabbit) configuration"

Browse Source
This commit is contained in:
Jenkins 2016-05-13 00:00:08 +00:00 committed by Gerrit Code Review
commit fd08f3f481
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
manifests/init.pp
View File

@ -12,6 +12,11 @@
# (Optional) Notification driver to use # (Optional) Notification driver to use
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*rpc_backend*]
# (optional) The rpc backend implementation to use, can be:
# rabbit (for rabbitmq)
# Defaults to 'rabbit'
#
# [*rabbit_host*] # [*rabbit_host*]
# (Optional) Host for rabbit server # (Optional) Host for rabbit server
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -61,6 +66,7 @@
class magnum( class magnum(
$package_ensure = 'present', $package_ensure = 'present',
$notification_driver = $::os_service_default, $notification_driver = $::os_service_default,
$rpc_backend = 'rabbit',
$rabbit_host = $::os_service_default, $rabbit_host = $::os_service_default,
$rabbit_hosts = $::os_service_default, $rabbit_hosts = $::os_service_default,
$rabbit_port = $::os_service_default, $rabbit_port = $::os_service_default,
@ -85,32 +91,31 @@ class magnum(
tag => ['openstack', 'magnum-package'], tag => ['openstack', 'magnum-package'],
} }
magnum_config { if $rpc_backend == 'rabbit' {
'DEFAULT/rpc_backend' : value => 'rabbit';
'oslo_messaging_rabbit/userid' : value => $rabbit_userid;
'oslo_messaging_rabbit/rabbit_password' : value => $rabbit_password, secret => true;
'oslo_messaging_rabbit/rabbit_virtual_host' : value => $rabbit_virtual_host;
'oslo_messaging_rabbit/rabbit_use_ssl' : value => $rabbit_use_ssl;
'oslo_messaging_rabbit/kombu_ssl_ca_certs' : value => $kombu_ssl_ca_certs;
'oslo_messaging_rabbit/kombu_ssl_certfile' : value => $kombu_ssl_certfile;
'oslo_messaging_rabbit/kombu_ssl_keyfile' : value => $kombu_ssl_keyfile;
'oslo_messaging_rabbit/kombu_ssl_version' : value => $kombu_ssl_version;
}
if ! is_service_default($rabbit_hosts) and $rabbit_hosts { if ! $rabbit_password {
magnum_config { 'oslo_messaging_rabbit/rabbit_hosts': value => join(any2array($rabbit_hosts), ',') } fail('Please specify a rabbit_password parameter.')
} else { }
magnum_config { 'oslo_messaging_rabbit/rabbit_host': value => $rabbit_host }
magnum_config { 'oslo_messaging_rabbit/rabbit_port': value => $rabbit_port }
magnum_config { 'oslo_messaging_rabbit/rabbit_hosts': ensure => absent }
}
if !is_service_default($notification_driver) and $notification_driver { oslo::messaging::rabbit { 'magnum_config':
magnum_config { rabbit_userid => $rabbit_userid,
'DEFAULT/notification_driver': value => join(any2array($notification_driver), ','); rabbit_password => $rabbit_password,
rabbit_virtual_host => $rabbit_virtual_host,
rabbit_host => $rabbit_host,
rabbit_port => $rabbit_port,
rabbit_hosts => $rabbit_hosts,
rabbit_use_ssl => $rabbit_use_ssl,
kombu_ssl_version => $kombu_ssl_version,
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile,
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
} }
} else { } else {
magnum_config { 'DEFAULT/notification_driver': ensure => absent; } magnum_config { 'DEFAULT/rpc_backend': value => $rpc_backend }
}
oslo::messaging::notifications { 'magnum_config':
driver => $notification_driver
} }
} }

18
spec/classes/magnum_init_spec.rb
View File

@ -44,12 +44,12 @@ describe 'magnum' do
context 'with overridden parameters' do context 'with overridden parameters' do
let :params do let :params do
{ :package_ensure => 'latest', { :package_ensure => 'latest',
:notification_driver => 'messagingv1', :notification_driver => 'messagingv1',
:rabbit_host => '53.210.103.65', :rabbit_host => '53.210.103.65',
:rabbit_port => '1234', :rabbit_port => '1234',
:rabbit_userid => 'me', :rabbit_userid => 'me',
:rabbit_password => 'secrete', :rabbit_password => 'secrete',
:rabbit_virtual_host => 'vhost', :rabbit_virtual_host => 'vhost',
} }
end end
@ -101,12 +101,12 @@ describe 'magnum' do
context 'with rabbit ssl enabled with kombu' do context 'with rabbit ssl enabled with kombu' do
let :params do let :params do
{ :rabbit_hosts => ['rabbit:5673'], { :rabbit_hosts => ['rabbit:5673'],
:rabbit_use_ssl => true, :rabbit_use_ssl => true,
:kombu_ssl_ca_certs => '/etc/ca.crt', :kombu_ssl_ca_certs => '/etc/ca.crt',
:kombu_ssl_certfile => '/etc/certfile', :kombu_ssl_certfile => '/etc/certfile',
:kombu_ssl_keyfile => '/etc/key', :kombu_ssl_keyfile => '/etc/key',
:kombu_ssl_version => 'TLSv1', :kombu_ssl_version => 'TLSv1',
} }
end end