From 24efd644248c16e76faccd83d807dd5e085e85d7 Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Mon, 21 Dec 2015 18:57:46 +0200 Subject: [PATCH] Add report_interval and service_down_time parameters. These parameters were added to have a possibility to manage their values. Related-Bug: #1448151 Change-Id: I50140828ffd472a9da45f3de7822b0dd3e211d00 --- manifests/init.pp | 14 ++++++++++++++ spec/classes/cinder_spec.rb | 2 ++ 2 files changed, 16 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index e8edf936..91b1489f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -69,6 +69,16 @@ # (optional) Connect over SSL for RabbitMQ # Defaults to false # +# [*report_interval*] +# (optional) Interval, in seconds, between nodes reporting state to +# datastore (integer value). +# Defaults to $::os_service_default +# +# [*service_down_time*] +# (optional) Maximum time since last check-in for a service to be +# considered up (integer value). +# Defaults to $::os_service_default +# # [*kombu_ssl_ca_certs*] # (optional) SSL certification authority file (valid only if SSL enabled). # Defaults to $::os_service_default @@ -256,6 +266,8 @@ class cinder ( $rabbit_userid = 'guest', $rabbit_password = false, $rabbit_use_ssl = false, + $service_down_time = $::os_service_default, + $report_interval = $::os_service_default, $kombu_ssl_ca_certs = $::os_service_default, $kombu_ssl_certfile = $::os_service_default, $kombu_ssl_keyfile = $::os_service_default, @@ -340,6 +352,8 @@ class cinder ( 'oslo_messaging_rabbit/heartbeat_timeout_threshold': value => $rabbit_heartbeat_timeout_threshold; 'oslo_messaging_rabbit/heartbeat_rate': value => $rabbit_heartbeat_rate; 'DEFAULT/control_exchange': value => $control_exchange; + 'DEFAULT/report_interval': value => $report_interval; + 'DEFAULT/service_down_time': value => $service_down_time; 'oslo_messaging_rabbit/amqp_durable_queues': value => $amqp_durable_queues; } diff --git a/spec/classes/cinder_spec.rb b/spec/classes/cinder_spec.rb index ba7aaacc..b1201816 100644 --- a/spec/classes/cinder_spec.rb +++ b/spec/classes/cinder_spec.rb @@ -28,6 +28,8 @@ describe 'cinder' do it 'should contain default config' do is_expected.to contain_cinder_config('DEFAULT/rpc_backend').with(:value => 'rabbit') is_expected.to contain_cinder_config('DEFAULT/control_exchange').with(:value => 'openstack') + is_expected.to contain_cinder_config('DEFAULT/report_interval').with(:value => '') + is_expected.to contain_cinder_config('DEFAULT/service_down_time').with(:value => '') is_expected.to contain_cinder_config('oslo_messaging_rabbit/rabbit_password').with(:value => 'guest', :secret => true) is_expected.to contain_cinder_config('oslo_messaging_rabbit/rabbit_host').with(:value => '127.0.0.1') is_expected.to contain_cinder_config('oslo_messaging_rabbit/rabbit_port').with(:value => '5672')