From 6b0c04a4720036828ffc5e8ea690fdeddc1a77fb Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 15 Aug 2017 19:52:07 +0300 Subject: 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 --- spec/classes/tripleo_profile_base_barbican_api_spec.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'spec/classes') diff --git a/spec/classes/tripleo_profile_base_barbican_api_spec.rb b/spec/classes/tripleo_profile_base_barbican_api_spec.rb index 169642e..881cc0a 100644 --- a/spec/classes/tripleo_profile_base_barbican_api_spec.rb +++ b/spec/classes/tripleo_profile_base_barbican_api_spec.rb @@ -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') -- cgit 1.2.3-korg