openstack
/
puppet-tripleo
Code Issues Proposed changes

Include gnocchi::db explicitly 

The inclusion of gnocchi::db will be removed from gnocchi when we
remove deprecated database_connection parameter[1], thus we should
include the class explicitly.

[1] https://review.opendev.org/#/c/748928/

Change-Id: I2f52473edb78b5359eeb5c734b4d9691f86ccd26
This commit is contained in:
Takashi Kajinami 2020-08-31 17:39:56 +09:00
parent 706d8ce3ee
commit 97febdc778
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/profile/base/gnocchi.pp
View File

@ -91,6 +91,7 @@ class tripleo::profile::base::gnocchi (
class { 'gnocchi':
coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]),
}
include gnocchi::db
include gnocchi::config
include gnocchi::cors
include gnocchi::client

4
spec/classes/tripleo_profile_base_gnocchi_spec.rb
View File

@ -30,6 +30,7 @@ describe 'tripleo::profile::base::gnocchi' do
it {
is_expected.to_not contain_class('gnocchi')
is_expected.to_not contain_class('gnocchi::db')
is_expected.to_not contain_class('gnocchi::config')
is_expected.to_not contain_class('gnocchi::cors')
is_expected.to_not contain_class('gnocchi::client')
@ -49,6 +50,7 @@ describe 'tripleo::profile::base::gnocchi' do
is_expected.to contain_class('gnocchi').with(
:coordination_url => 'redis://:gnocchi@127.0.0.1:6379/'
)
is_expected.to contain_class('gnocchi::db')
is_expected.to contain_class('gnocchi::config')
is_expected.to contain_class('gnocchi::cors')
is_expected.to contain_class('gnocchi::client')
@ -64,6 +66,7 @@ describe 'tripleo::profile::base::gnocchi' do
it {
is_expected.to_not contain_class('gnocchi')
is_expected.to_not contain_class('gnocchi::db')
is_expected.to_not contain_class('gnocchi::config')
is_expected.to_not contain_class('gnocchi::cors')
is_expected.to_not contain_class('gnocchi::client')
@ -82,6 +85,7 @@ describe 'tripleo::profile::base::gnocchi' do
is_expected.to contain_class('gnocchi').with(
:coordination_url => 'redis://:gnocchi@127.0.0.1:6379/'
)
is_expected.to contain_class('gnocchi::db')
is_expected.to contain_class('gnocchi::config')
is_expected.to contain_class('gnocchi::cors')
is_expected.to contain_class('gnocchi::client')