openstack
/
fuel-library
Code Issues Proposed changes

Merge "Change default db reconnection tries count to -1"

This commit is contained in:
Jenkins 2017-02-27 09:49:47 +00:00 committed by Gerrit Code Review
parent b2024b95e1 a0bbe2cc46
commit 771a73af75
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
View File

@ -45,7 +45,7 @@ class openstack_tasks::ceilometer::controller {
$memcached_servers = hiera('memcached_servers')
$local_memcached_server = hiera('local_memcached_server')
$database_max_retries = pick($ceilometer_hash['database_max_retries'], '-1')
#as $ssl default value in ceilometer::wsgi::apache is true and
#we use SSL at HAproxy, but not the API host we should set 'false'
#value for $ssl.
@ -159,8 +159,9 @@ class openstack_tasks::ceilometer::controller {
Service<| title == 'ceilometer-polling'|>
class { '::ceilometer::db':
database_connection => $db_connection,
sync_db => $primary_controller,
database_connection => $db_connection,
sync_db => $primary_controller,
database_max_retries => $database_max_retries,
}
class { 'osnailyfacter::apache':

6
tests/noop/spec/hosts/ceilometer/controller_spec.rb
View File

@ -70,6 +70,8 @@ describe manifest do
rabbit_heartbeat_timeout_threshold = Noop.puppet_function 'pick', ceilometer_hash['rabbit_heartbeat_timeout_threshold'], rabbit_hash['heartbeat_timeout_treshold'], 60
rabbit_heartbeat_rate = Noop.puppet_function 'pick', ceilometer_hash['rabbit_heartbeat_rate'], rabbit_hash['heartbeat_rate'], 2
database_max_retries = Noop.puppet_function 'pick', ceilometer_hash['database_max_retries'], '-1'
# Ceilometer
if ceilometer_hash['enabled']
it 'should configure RabbitMQ Heartbeat parameters' do
@ -86,6 +88,10 @@ describe manifest do
should contain_ceilometer_config('database/connection').with(:value => "mongodb://#{ceilometer_db_user}:#{ceilometer_db_password}@#{db_hosts}/#{ceilometer_db_dbname}#{db_params}")
end
it 'should configure oslo_database params properly' do
should contain_ceilometer_config('database/max_retries').with(:value => "#{database_max_retries}")
end
it 'should declare ceilometer::wsgi::apache class with correct parameters' do
should contain_class('ceilometer::wsgi::apache').with(
'ssl' => ssl,