openstack
/
puppet-tripleo
Code Issues Proposed changes

Move barbican's database creation to mysql profile 

This makes sure that the database creation is only executed on the mysql
profile (or container if that's enabled), and stops the conflicts and
errors that were happening when barbican was deployed in containerized
environments.

Change-Id: Ib5c99482f62397fc5fb79a9dc537dfb06ee7f4df
Closes-Bug: #1710928
This commit is contained in:
Juan Antonio Osorio Robles 2017-08-15 19:52:07 +03:00 committed by Emilien Macchi
parent c82a5fe7e0
commit 6b0c04a472
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/barbican/api.pp
View File

@ -129,10 +129,6 @@ class tripleo::profile::base::barbican::api (
include ::tripleo::profile::base::barbican
if $step >= 3 and $sync_db {
include ::barbican::db::mysql
}
if $step >= 4 or ( $step >= 3 and $sync_db ) {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
class { '::barbican::api':

3
manifests/profile/base/database/mysql.pp
View File

@ -171,6 +171,9 @@ class tripleo::profile::base::database::mysql (
if hiera('cinder_api_enabled', false) {
include ::cinder::db::mysql
}
if hiera('barbican_api_enabled', false) {
include ::barbican::db::mysql
}
if hiera('congress_enabled', false) {
include ::congress::db::mysql
}

3
spec/classes/tripleo_profile_base_barbican_api_spec.rb
View File

@ -45,7 +45,6 @@ describe 'tripleo::profile::base::barbican::api' do
it 'should trigger complete configuration' do
is_expected.to contain_class('tripleo::profile::base::barbican::api')
is_expected.to contain_class('tripleo::profile::base::barbican')
is_expected.to contain_class('barbican::db::mysql')
is_expected.to contain_class('barbican::db::sync')
is_expected.to contain_class('barbican::api')
is_expected.to contain_class('barbican::api::logging')
@ -64,7 +63,6 @@ describe 'tripleo::profile::base::barbican::api' do
it 'should not trigger any configuration' do
is_expected.to contain_class('tripleo::profile::base::barbican::api')
is_expected.to contain_class('tripleo::profile::base::barbican')
is_expected.to_not contain_class('barbican::db::mysql')
is_expected.to_not contain_class('barbican::db::sync')
is_expected.to_not contain_class('barbican::api')
is_expected.to_not contain_class('barbican::api::logging')
@ -81,7 +79,6 @@ describe 'tripleo::profile::base::barbican::api' do
} }
it 'should trigger complete configuration with out db items' do
is_expected.to_not contain_class('barbican::db::mysql')
# TODO(aschultz): barbican::api includes this automatically
#is_expected.to_not contain_class('barbican::db::sync')
is_expected.to contain_class('barbican::api')