openstack/puppet-nova
Code Issues Proposed changes

Use module specific name for oslo::db

Browse Source 
... to avoid potential conflict with the other modules.

Change-Id: I3c8a773c621d87ee127e2992d26a37ed601a663a
This commit is contained in:
Takashi Kajinami 2024-10-28 02:39:01 +09:00
parent 16a1342459
commit 73a3351a48
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/db.pp
View File

@ -133,7 +133,7 @@ class nova::db (
slave_connection => $slave_connection, slave_connection => $slave_connection,
} }
oslo::db { 'api_database': oslo::db { 'nova_config_api':
config => 'nova_config', config => 'nova_config',
config_group => 'api_database', config_group => 'api_database',
connection => $api_database_connection, connection => $api_database_connection,
@ -149,6 +149,6 @@ class nova::db (
# all db settings should be applied and all packages should be installed # all db settings should be applied and all packages should be installed
# before dbsync starts # before dbsync starts
Oslo::Db['nova_config'] -> Anchor['nova::dbsync::begin'] Oslo::Db['nova_config'] -> Anchor['nova::dbsync::begin']
Oslo::Db['api_database'] -> Anchor['nova::dbsync::begin'] Oslo::Db['nova_config_api'] -> Anchor['nova::dbsync::begin']
Oslo::Db['api_database'] -> Anchor['nova::dbsync_api::begin'] Oslo::Db['nova_config_api'] -> Anchor['nova::dbsync_api::begin']
} }

4
spec/classes/nova_db_spec.rb
View File

@ -19,7 +19,7 @@ describe 'nova::db' do
:pool_timeout => '<SERVICE DEFAULT>', :pool_timeout => '<SERVICE DEFAULT>',
:mysql_enable_ndb => '<SERVICE DEFAULT>', :mysql_enable_ndb => '<SERVICE DEFAULT>',
)} )}
it { should contain_oslo__db('api_database').with( it { should contain_oslo__db('nova_config_api').with(
:config => 'nova_config', :config => 'nova_config',
:config_group => 'api_database', :config_group => 'api_database',
:connection => '<SERVICE DEFAULT>', :connection => '<SERVICE DEFAULT>',
@ -70,7 +70,7 @@ describe 'nova::db' do
:mysql_enable_ndb => 'true', :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 => 'nova_config',
:config_group => 'api_database', :config_group => 'api_database',
:connection => 'mysql+pymysql://user:pass@db/db2', :connection => 'mysql+pymysql://user:pass@db/db2',