From df41e1e1afa66c31d5ecd389425d492520a29f1a Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Tue, 25 Apr 2017 16:33:56 -0400 Subject: [PATCH] Add sasl_default_realm to oslo_messaging_amqp options Change-Id: I4225c65f51ce8ab6c479c6fcb7362cb7f3c71370 --- manifests/messaging/amqp.pp | 6 ++++++ spec/defines/oslo_messaging_amqp_spec.rb | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/manifests/messaging/amqp.pp b/manifests/messaging/amqp.pp index 0a6e917..c3c1cfb 100644 --- a/manifests/messaging/amqp.pp +++ b/manifests/messaging/amqp.pp @@ -105,6 +105,10 @@ # (Optional) Name of configuration file (without .conf suffix) # Defaults to $::os_service_default. # +# [*sasl_default_realm*] +# (Optional) SASL realm to use if not realm present in username +# Defaults to $:os_service_default. +# # [*username*] # (Optional) User name for message broker authentication # Defaults to $::os_service_default. @@ -146,6 +150,7 @@ define oslo::messaging::amqp( $sasl_mechanisms = $::os_service_default, $sasl_config_dir = $::os_service_default, $sasl_config_name = $::os_service_default, + $sasl_default_realm = $::os_service_default, $username = $::os_service_default, $password = $::os_service_default, $default_send_timeout = $::os_service_default, @@ -175,6 +180,7 @@ define oslo::messaging::amqp( 'oslo_messaging_amqp/sasl_mechanisms' => { value => $sasl_mechanisms }, 'oslo_messaging_amqp/sasl_config_dir' => { value => $sasl_config_dir }, 'oslo_messaging_amqp/sasl_config_name' => { value => $sasl_config_name }, + 'oslo_messaging_amqp/sasl_default_realm' => { value => $sasl_default_realm }, 'oslo_messaging_amqp/username' => { value => $username }, 'oslo_messaging_amqp/password' => { value => $password, secret => true }, 'oslo_messaging_amqp/default_send_timeout' => { value => $default_send_timeout }, diff --git a/spec/defines/oslo_messaging_amqp_spec.rb b/spec/defines/oslo_messaging_amqp_spec.rb index f465493..bf4da06 100644 --- a/spec/defines/oslo_messaging_amqp_spec.rb +++ b/spec/defines/oslo_messaging_amqp_spec.rb @@ -32,6 +32,7 @@ describe 'oslo::messaging::amqp' do is_expected.to contain_keystone_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') is_expected.to contain_keystone_config('oslo_messaging_amqp/sasl_config_dir').with_value('') is_expected.to contain_keystone_config('oslo_messaging_amqp/sasl_config_name').with_value('') + is_expected.to contain_keystone_config('oslo_messaging_amqp/sasl_default_realm').with_value('') is_expected.to contain_keystone_config('oslo_messaging_amqp/username').with_value('') is_expected.to contain_keystone_config('oslo_messaging_amqp/password').with_value('').with_secret(true) is_expected.to contain_keystone_config('oslo_messaging_amqp/default_send_timeout').with_value('') @@ -42,12 +43,13 @@ describe 'oslo::messaging::amqp' do context 'with overridden parameters' do let :params do - { :idle_timeout => 2000, - :container_name => 'openstack', - :username => 'newuser', - :password => 'p@ssw0rd', - :pre_settled => ['rpc-cast','rpc-reply','notify'], - :ssl => true, + { :idle_timeout => 2000, + :container_name => 'openstack', + :username => 'newuser', + :password => 'p@ssw0rd', + :pre_settled => ['rpc-cast','rpc-reply','notify'], + :ssl => true, + :sasl_default_realm => 'overcloud-1' } end it 'configure oslo_messaging_amqp with overriden values' do @@ -57,6 +59,7 @@ describe 'oslo::messaging::amqp' do is_expected.to contain_keystone_config('oslo_messaging_amqp/password').with_value('p@ssw0rd').with_secret(true) is_expected.to contain_keystone_config('oslo_messaging_amqp/pre_settled').with_value(['rpc-cast','rpc-reply','notify']) is_expected.to contain_keystone_config('oslo_messaging_amqp/ssl').with_value(true) + is_expected.to contain_keystone_config('oslo_messaging_amqp/sasl_default_realm').with_value('overcloud-1') end end