From cc50dfbe772975043e32d3accaa35c055450e69b Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 1 Mar 2017 10:12:09 +0800 Subject: [PATCH] Add rpc_response_timeout option Add rpc_response_timeout to configure seconds time for waiting for a response from a call. Change-Id: Ibb64a1d6faeeb0bc74426e70dbfdf726313d36f7 --- manifests/init.pp | 10 ++++++++-- ...messaging_default_parameters-8719a35df77146e1.yaml | 4 ++++ spec/classes/keystone_init_spec.rb | 11 +++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/add_messaging_default_parameters-8719a35df77146e1.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 4c2e0d3e0..58161ba56 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -283,6 +283,10 @@ # (string value) # Default to $::os_service_default # +# [*rpc_response_timeout*] +# (Optional) Seconds to wait for a response from a call. +# Defaults to $::os_service_default +# # [*public_bind_host*] # (optional) The IP address of the public network interface to listen on # Default to '0.0.0.0'. @@ -720,6 +724,7 @@ class keystone( $notification_topics = $::os_service_default, $notification_format = $::os_service_default, $control_exchange = $::os_service_default, + $rpc_response_timeout = $::os_service_default, $validate_service = false, $validate_insecure = false, $validate_auth_url = false, @@ -1046,8 +1051,9 @@ Fernet or UUID tokens are recommended.") } oslo::messaging::default { 'keystone_config': - transport_url => $default_transport_url, - control_exchange => $control_exchange, + transport_url => $default_transport_url, + control_exchange => $control_exchange, + rpc_response_timeout => $rpc_response_timeout, } oslo::messaging::notifications { 'keystone_config': diff --git a/releasenotes/notes/add_messaging_default_parameters-8719a35df77146e1.yaml b/releasenotes/notes/add_messaging_default_parameters-8719a35df77146e1.yaml new file mode 100644 index 000000000..4809dbe3a --- /dev/null +++ b/releasenotes/notes/add_messaging_default_parameters-8719a35df77146e1.yaml @@ -0,0 +1,4 @@ +--- +features: + - Add new parameter "rpc_response_timeout", seconds to wait for a + response from a call diff --git a/spec/classes/keystone_init_spec.rb b/spec/classes/keystone_init_spec.rb index 7e484fb88..4df84f9e4 100644 --- a/spec/classes/keystone_init_spec.rb +++ b/spec/classes/keystone_init_spec.rb @@ -744,6 +744,7 @@ describe 'keystone' do it { is_expected.to contain_keystone_config('oslo_messaging_notifications/topics').with_value('') } it { is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('') } it { is_expected.to contain_keystone_config('DEFAULT/control_exchange').with_value('') } + it { is_expected.to contain_keystone_config('DEFAULT/rpc_response_timeout').with_value('') } end describe 'with RabbitMQ communication SSLed' do @@ -797,10 +798,11 @@ describe 'keystone' do describe 'setting notification settings' do let :params do default_params.merge({ - :notification_driver => ['keystone.openstack.common.notifier.rpc_notifier'], - :notification_topics => ['notifications'], - :notification_format => 'cadf', - :control_exchange => 'keystone' + :notification_driver => ['keystone.openstack.common.notifier.rpc_notifier'], + :notification_topics => ['notifications'], + :notification_format => 'cadf', + :control_exchange => 'keystone', + :rpc_response_timeout => '120' }) end @@ -808,6 +810,7 @@ describe 'keystone' do it { is_expected.to contain_keystone_config('oslo_messaging_notifications/topics').with_value('notifications') } it { is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('cadf') } it { is_expected.to contain_keystone_config('DEFAULT/control_exchange').with_value('keystone') } + it { is_expected.to contain_keystone_config('DEFAULT/rpc_response_timeout').with_value('120') } end describe 'setting kombu settings' do