diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
index 096b70b9eb..24dff68a3b 100644
--- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
+++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
@@ -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':
diff --git a/tests/noop/spec/hosts/ceilometer/controller_spec.rb b/tests/noop/spec/hosts/ceilometer/controller_spec.rb
index 8f5c522bce..7f87648950 100644
--- a/tests/noop/spec/hosts/ceilometer/controller_spec.rb
+++ b/tests/noop/spec/hosts/ceilometer/controller_spec.rb
@@ -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,