diff --git a/manifests/db.pp b/manifests/db.pp index f7c2cef19..93daec8a3 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -133,7 +133,7 @@ class nova::db ( slave_connection => $slave_connection, } - oslo::db { 'api_database': + oslo::db { 'nova_config_api': config => 'nova_config', config_group => 'api_database', connection => $api_database_connection, @@ -149,6 +149,6 @@ class nova::db ( # all db settings should be applied and all packages should be installed # before dbsync starts Oslo::Db['nova_config'] -> Anchor['nova::dbsync::begin'] - Oslo::Db['api_database'] -> Anchor['nova::dbsync::begin'] - Oslo::Db['api_database'] -> Anchor['nova::dbsync_api::begin'] + Oslo::Db['nova_config_api'] -> Anchor['nova::dbsync::begin'] + Oslo::Db['nova_config_api'] -> Anchor['nova::dbsync_api::begin'] } diff --git a/spec/classes/nova_db_spec.rb b/spec/classes/nova_db_spec.rb index b57d698ca..20cac164c 100644 --- a/spec/classes/nova_db_spec.rb +++ b/spec/classes/nova_db_spec.rb @@ -19,7 +19,7 @@ describe 'nova::db' do :pool_timeout => '', :mysql_enable_ndb => '', )} - it { should contain_oslo__db('api_database').with( + it { should contain_oslo__db('nova_config_api').with( :config => 'nova_config', :config_group => 'api_database', :connection => '', @@ -70,7 +70,7 @@ describe 'nova::db' do :mysql_enable_ndb => 'true', )} - it { should contain_oslo__db('api_database').with( + it { should contain_oslo__db('nova_config_api').with( :config => 'nova_config', :config_group => 'api_database', :connection => 'mysql+pymysql://user:pass@db/db2',