diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-08-14 23:01:54 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-08-14 23:01:54 +0000 |
commit | adf6802f91986e33e9d6c5e710aca01db674dc40 (patch) | |
tree | 4a5c8f0b7529e09ec66113b865bd7a052493d984 /spec/classes/tripleo_profile_base_nova_compute_spec.rb | |
parent | 8505a2dc0edeb4da8c02d68c7229c36800392cca (diff) | |
parent | 5ae3fab74381403cc76525ba3ff63a60836c17c1 (diff) |
Merge "Fix legacy nova/cinder encryption key manager configuration"
Diffstat (limited to 'spec/classes/tripleo_profile_base_nova_compute_spec.rb')
-rw-r--r-- | spec/classes/tripleo_profile_base_nova_compute_spec.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/spec/classes/tripleo_profile_base_nova_compute_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_spec.rb index b3959c4..22881ac 100644 --- a/spec/classes/tripleo_profile_base_nova_compute_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_compute_spec.rb @@ -18,12 +18,19 @@ require 'spec_helper' describe 'tripleo::profile::base::nova::compute' do shared_examples_for 'tripleo::profile::base::nova::compute' do + before :each do + facts.merge!({ :step => params[:step] }) + end context 'with step less than 5' do let(:params) { { :step => 1, } } it { - is_expected.to contain_class('tripleo::profile::base::nova::compute') + is_expected.to contain_class('tripleo::profile::base::nova::compute').with( + # Verify legacy key manager is enabled when none is set in hiera. + :keymgr_api_class => 'nova.keymgr.conf_key_mgr.ConfKeyManager', + ) + is_expected.to_not contain_class('tripleo::profile::base::nova') is_expected.to_not contain_class('nova::compute') is_expected.to_not contain_class('nova::network::neutron') @@ -50,7 +57,10 @@ eos let(:params) { { :step => 4, } } it { - is_expected.to contain_class('tripleo::profile::base::nova::compute') + is_expected.to contain_class('tripleo::profile::base::nova::compute').with( + # Verify proper key manager is enabled when value is set in hiera. + :keymgr_api_class => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager', + ) is_expected.to contain_class('tripleo::profile::base::nova') is_expected.to contain_class('tripleo::profile::base::nova') is_expected.to contain_class('nova::compute') |