diff --git a/deployment/puppet/osnailyfacter/modular/ironic/ironic.pp b/deployment/puppet/osnailyfacter/modular/ironic/ironic.pp
index 8edd6cff14..3c739ae28c 100644
--- a/deployment/puppet/osnailyfacter/modular/ironic/ironic.pp
+++ b/deployment/puppet/osnailyfacter/modular/ironic/ironic.pp
@@ -38,19 +38,20 @@ prepare_network_config(hiera_hash('network_scheme', {}))
 $baremetal_vip = $network_metadata['vips']['baremetal']['ipaddr']
 
 class { 'ironic':
-  verbose             => $verbose,
-  debug               => $debug,
-  rabbit_hosts        => $rabbit_hosts,
-  rabbit_port         => $amqp_port,
-  rabbit_userid       => $rabbit_hash['user'],
-  rabbit_password     => $rabbit_hash['password'],
-  amqp_durable_queues => $amqp_durable_queues,
-  control_exchange    => 'ironic',
-  use_syslog          => $use_syslog,
-  log_facility        => $syslog_log_facility_ironic,
-  database_connection => $database_connection,
-  glance_api_servers  => $glance_api_servers,
-  sync_db             => $primary_controller,
+  verbose              => $verbose,
+  debug                => $debug,
+  rabbit_hosts         => $rabbit_hosts,
+  rabbit_port          => $amqp_port,
+  rabbit_userid        => $rabbit_hash['user'],
+  rabbit_password      => $rabbit_hash['password'],
+  amqp_durable_queues  => $amqp_durable_queues,
+  control_exchange     => 'ironic',
+  use_syslog           => $use_syslog,
+  log_facility         => $syslog_log_facility_ironic,
+  database_connection  => $database_connection,
+  database_max_retries => '-1',
+  glance_api_servers   => $glance_api_servers,
+  sync_db              => $primary_controller,
 }
 
 # TODO (iberezovskiy): Move to globals (as it is done for sahara)
diff --git a/deployment/puppet/osnailyfacter/modular/roles/ironic-conductor.pp b/deployment/puppet/osnailyfacter/modular/roles/ironic-conductor.pp
index 8f9168b08a..c25e986d45 100644
--- a/deployment/puppet/osnailyfacter/modular/roles/ironic-conductor.pp
+++ b/deployment/puppet/osnailyfacter/modular/roles/ironic-conductor.pp
@@ -47,18 +47,19 @@ package { 'ironic-fa-deploy':
 }
 
 class { '::ironic':
-  verbose             => $verbose,
-  debug               => $debug,
-  enabled_drivers     => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
-  rabbit_hosts        => $rabbit_hosts,
-  rabbit_userid       => $rabbit_hash['user'],
-  rabbit_password     => $rabbit_hash['password'],
-  amqp_durable_queues => $amqp_durable_queues,
-  control_exchange    => 'ironic',
-  use_syslog          => $use_syslog,
-  log_facility        => $syslog_log_facility_ironic,
-  database_connection => $database_connection,
-  glance_api_servers  => $glance_api_servers,
+  verbose              => $verbose,
+  debug                => $debug,
+  enabled_drivers      => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
+  rabbit_hosts         => $rabbit_hosts,
+  rabbit_userid        => $rabbit_hash['user'],
+  rabbit_password      => $rabbit_hash['password'],
+  amqp_durable_queues  => $amqp_durable_queues,
+  control_exchange     => 'ironic',
+  use_syslog           => $use_syslog,
+  log_facility         => $syslog_log_facility_ironic,
+  database_connection  => $database_connection,
+  database_max_retries => '-1',
+  glance_api_servers   => $glance_api_servers,
 }
 
 class { '::ironic::client': }
diff --git a/tests/noop/spec/hosts/ironic/ironic_spec.rb b/tests/noop/spec/hosts/ironic/ironic_spec.rb
index aa1e0dcf31..bf022b7a29 100644
--- a/tests/noop/spec/hosts/ironic/ironic_spec.rb
+++ b/tests/noop/spec/hosts/ironic/ironic_spec.rb
@@ -20,11 +20,12 @@ if ironic_enabled
 
       it 'should declare ironic class correctly' do
         should contain_class('ironic').with(
-          'rabbit_userid'       => rabbit_user,
-          'rabbit_password'     => rabbit_password,
-          'sync_db'             => primary_controller,
-          'control_exchange'    => 'ironic',
-          'amqp_durable_queues' => amqp_durable_queues,
+          'rabbit_userid'        => rabbit_user,
+          'rabbit_password'      => rabbit_password,
+          'sync_db'              => primary_controller,
+          'control_exchange'     => 'ironic',
+          'amqp_durable_queues'  => amqp_durable_queues,
+          'database_max_retries' => '-1',
         )
       end
 
diff --git a/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb b/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb
index 1e9aa37bb1..26db185d85 100644
--- a/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb
+++ b/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb
@@ -17,11 +17,12 @@ describe manifest do
 
       it 'should declare ironic class correctly' do
         should contain_class('ironic').with(
-          'rabbit_userid'       => rabbit_user,
-          'rabbit_password'     => rabbit_password,
-          'enabled_drivers'     => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
-          'control_exchange'    => 'ironic',
-          'amqp_durable_queues' => amqp_durable_queues,
+          'rabbit_userid'        => rabbit_user,
+          'rabbit_password'      => rabbit_password,
+          'enabled_drivers'      => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
+          'control_exchange'     => 'ironic',
+          'amqp_durable_queues'  => amqp_durable_queues,
+          'database_max_retries' => '-1',
         )
       end