openstack
/
puppet-keystone
Code Issues Proposed changes

Add default_transport_url option 

Change-Id: I196e089f7081f59360680a8921cde2c84acf0c0e
(cherry picked from commit 0f8ef09dfb)
This commit is contained in:
Alex Schultz 2016-11-08 12:57:39 -07:00 committed by Mykyta Karpin
parent 71ba061e73
commit 005134fc6c
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/init.pp
View File

@ -195,6 +195,12 @@
# (optional) If set, use this value for max_overflow with sqlalchemy.
# Defaults to: undef
#
# [*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_host*]
# (optional) Location of rabbitmq installation.
# Defaults to $::os_service_default
@ -570,7 +576,7 @@
# in the keystone config.
# Defaults to false.
#
# DEPRECATED PARAMETERS
# === DEPRECATED PARAMETERS
#
# [*service_provider*]
# (optional) Deprecated. Provider, that can be used for keystone service.
@ -704,6 +710,7 @@ class keystone(
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
$rabbit_heartbeat_rate = $::os_service_default,
$rabbit_use_ssl = $::os_service_default,
$default_transport_url = $::os_service_default,
$rabbit_ha_queues = $::os_service_default,
$kombu_ssl_ca_certs = $::os_service_default,
$kombu_ssl_certfile = $::os_service_default,
@ -1034,6 +1041,7 @@ Fernet or UUID tokens are recommended.")
}
oslo::messaging::default { 'keystone_config':
transport_url => $default_transport_url,
control_exchange => $control_exchange,
}

6
spec/classes/keystone_spec.rb
View File

@ -58,6 +58,7 @@ describe 'keystone' do
'signing_ca_key' => '<SERVICE DEFAULT>',
'signing_cert_subject' => '<SERVICE DEFAULT>',
'signing_key_size' => '<SERVICE DEFAULT>',
'default_transport_url' => '<SERVICE DEFAULT>',
'rabbit_host' => '<SERVICE DEFAULT>',
'rabbit_password' => '<SERVICE DEFAULT>',
'rabbit_userid' => '<SERVICE DEFAULT>',
@ -109,6 +110,7 @@ describe 'keystone' do
'signing_ca_key' => '/etc/keystone/ssl/private/cakey.pem',
'signing_cert_subject' => '/C=US/ST=Unset/L=Unset/O=Unset/CN=www.example.com',
'signing_key_size' => 2048,
'default_transport_url' => 'rabbit://user:pass@host:1234/virt',
'rabbit_host' => '127.0.0.1',
'rabbit_password' => 'openstack',
'rabbit_userid' => 'admin',
@ -230,6 +232,10 @@ describe 'keystone' do
is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_password').with_value(param_hash['rabbit_password']).with_secret(true)
end
it 'should contain correct default transport url' do
is_expected.to contain_keystone_config('DEFAULT/transport_url').with_value(params['default_transport_url'])
end
it 'should contain correct rabbit heartbeat configuration' do
is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value(param_hash['rabbit_heartbeat_timeout_threshold'])
is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_rate').with_value(param_hash['rabbit_heartbeat_rate'])