openstack
/
puppet-tripleo
Code Issues Proposed changes

Glance: Include new puppet classes for castellan options 

The keymgr_* parameters are deprecated and these parameters will be
completely migrated to glance::key_manager. This change ensures the new
classes are included.

Depends-on: https://review.opendev.org/772141
Change-Id: Idc5b51db85b007abad34d0d69cf5be9fe51c5f0d
This commit is contained in:
Takashi Kajinami 2021-05-13 08:55:29 +09:00
parent ade72d51ce
commit 5af44ea665
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/glance/api.pp
View File

@ -216,6 +216,8 @@ class tripleo::profile::base::glance::api (
default_backend => $glance_backend_id,
sync_db => $sync_db,
}
include glance::key_manager
include glance::key_manager::barbican
['cinder', 'file', 'rbd', 'swift'].each |String $backend_type| {

8
spec/classes/tripleo_profile_base_glance_api_spec.rb
View File

@ -34,6 +34,8 @@ describe 'tripleo::profile::base::glance::api' do
is_expected.to_not contain_class('glance::config')
is_expected.to_not contain_class('glance::api::logging')
is_expected.to_not contain_class('glance::api')
is_expected.to_not contain_class('glance::key_manager')
is_expected.to_not contain_class('glance::key_manager::barbican')
is_expected.to_not contain_class('glance::notify::rabbitmq')
is_expected.to_not contain_class('glance::cron::db_purge')
is_expected.to_not contain_class('glance::cache::cleaner')
@ -61,6 +63,8 @@ describe 'tripleo::profile::base::glance::api' do
is_expected.to contain_class('glance::config')
is_expected.to contain_class('glance::api::logging')
is_expected.to contain_class('glance::api')
is_expected.to contain_class('glance::key_manager')
is_expected.to contain_class('glance::key_manager::barbican')
is_expected.to contain_class('glance::notify::rabbitmq').with(
:default_transport_url => 'rabbit://glance1:foo@192.168.0.1:1234/?ssl=0',
:notification_transport_url => 'rabbit://glance2:baa@192.168.0.2:5678/?ssl=0',
@ -83,6 +87,8 @@ describe 'tripleo::profile::base::glance::api' do
is_expected.to_not contain_class('glance::config')
is_expected.to_not contain_class('glance::api::logging')
is_expected.to_not contain_class('glance::api')
is_expected.to_not contain_class('glance::key_manager')
is_expected.to_not contain_class('glance::key_manager::barbican')
is_expected.to_not contain_class('glance::notify::rabbitmq')
is_expected.to_not contain_class('glance::cron::db_purge')
is_expected.to_not contain_class('glance::cache::cleaner')
@ -113,6 +119,8 @@ describe 'tripleo::profile::base::glance::api' do
:enabled_backends => ['default_backend:swift'],
:default_backend => 'default_backend',
)
is_expected.to contain_class('glance::key_manager')
is_expected.to contain_class('glance::key_manager::barbican')
is_expected.to_not contain_class('tripleo::profile::base::glance::backend::cinder')
is_expected.to_not contain_class('tripleo::profile::base::glance::backend::file')
is_expected.to_not contain_class('tripleo::profile::base::glance::backend::rbd')