diff --git a/manifests/db.pp b/manifests/db.pp
index 2d794c2e2..89e662370 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -120,34 +120,29 @@ class nova::db (
 
   include nova::deps
 
-  if !is_service_default($database_connection) {
-    oslo::db { 'nova_config':
-      db_max_retries          => $database_db_max_retries,
-      connection              => $database_connection,
-      connection_recycle_time => $database_connection_recycle_time,
-      max_pool_size           => $database_max_pool_size,
-      max_retries             => $database_max_retries,
-      retry_interval          => $database_retry_interval,
-      max_overflow            => $database_max_overflow,
-      pool_timeout            => $database_pool_timeout,
-      mysql_enable_ndb        => $mysql_enable_ndb,
-      slave_connection        => $slave_connection,
-    }
+  oslo::db { 'nova_config':
+    db_max_retries          => $database_db_max_retries,
+    connection              => $database_connection,
+    connection_recycle_time => $database_connection_recycle_time,
+    max_pool_size           => $database_max_pool_size,
+    max_retries             => $database_max_retries,
+    retry_interval          => $database_retry_interval,
+    max_overflow            => $database_max_overflow,
+    pool_timeout            => $database_pool_timeout,
+    mysql_enable_ndb        => $mysql_enable_ndb,
+    slave_connection        => $slave_connection,
   }
 
-  if !is_service_default($api_database_connection) {
-    oslo::db { 'api_database':
-      config                  => 'nova_config',
-      config_group            => 'api_database',
-      connection              => $api_database_connection,
-      slave_connection        => $api_slave_connection,
-      connection_recycle_time => $api_database_connection_recycle_time,
-      max_pool_size           => $api_database_max_pool_size,
-      max_retries             => $api_database_max_retries,
-      retry_interval          => $api_database_retry_interval,
-      max_overflow            => $api_database_max_overflow,
-      pool_timeout            => $api_database_pool_timeout,
-    }
+  oslo::db { 'api_database':
+    config                  => 'nova_config',
+    config_group            => 'api_database',
+    connection              => $api_database_connection,
+    slave_connection        => $api_slave_connection,
+    connection_recycle_time => $api_database_connection_recycle_time,
+    max_pool_size           => $api_database_max_pool_size,
+    max_retries             => $api_database_max_retries,
+    retry_interval          => $api_database_retry_interval,
+    max_overflow            => $api_database_max_overflow,
+    pool_timeout            => $api_database_pool_timeout,
   }
-
 }
diff --git a/spec/classes/nova_db_spec.rb b/spec/classes/nova_db_spec.rb
index 00b4bbafb..b57d698ca 100644
--- a/spec/classes/nova_db_spec.rb
+++ b/spec/classes/nova_db_spec.rb
@@ -7,20 +7,8 @@ describe 'nova::db' do
 
   shared_examples 'nova::db' do
     context 'with default parameters' do
-      it { should_not contain_oslo__db('nova_config') }
-      it { should_not contain_oslo__db('api_database') }
-    end
-
-    context 'with connection parameters' do
-      before :each do
-        params.merge!(
-          :database_connection     => 'mysql+pymysql://user:pass@db/db1',
-          :api_database_connection => 'mysql+pymysql://user:pass@db/db2'
-        )
-      end
-
       it { should contain_oslo__db('nova_config').with(
-        :connection              => 'mysql+pymysql://user:pass@db/db1',
+        :connection              => '<SERVICE DEFAULT>',
         :slave_connection        => '<SERVICE DEFAULT>',
         :db_max_retries          => '<SERVICE DEFAULT>',
         :connection_recycle_time => '<SERVICE DEFAULT>',
@@ -34,7 +22,7 @@ describe 'nova::db' do
       it { should contain_oslo__db('api_database').with(
         :config                  => 'nova_config',
         :config_group            => 'api_database',
-        :connection              => 'mysql+pymysql://user:pass@db/db2',
+        :connection              => '<SERVICE DEFAULT>',
         :slave_connection        => '<SERVICE DEFAULT>',
         :connection_recycle_time => '<SERVICE DEFAULT>',
         :max_pool_size           => '<SERVICE DEFAULT>',