Merge "Fix legacy nova/cinder encryption key manager configuration"

2 files changed, 24 insertions, 4 deletions

diff --git a/spec/classes/tripleo_profile_base_cinder_api_spec.rb b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
index 03e2fd0..b9a9854 100644
--- a/spec/classes/tripleo_profile_base_cinder_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
@@ -18,6 +18,10 @@ require 'spec_helper'
 
 describe 'tripleo::profile::base::cinder::api' do
   shared_examples_for 'tripleo::profile::base::cinder::api' do
+    before :each do
+      facts.merge!({ :step => params[:step] })
+    end
+
     let(:pre_condition) do
       "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
     end
@@ -40,7 +44,10 @@ describe 'tripleo::profile::base::cinder::api' do
       } }
 
       it 'should trigger complete configuration' do
-        is_expected.to contain_class('cinder::api')
+        is_expected.to contain_class('cinder::api').with(
+          # Verify legacy key manager is enabled when none is set in hiera.
+          :keymgr_api_class => 'cinder.keymgr.conf_key_mgr.ConfKeyManager',
+        )
         is_expected.to contain_class('cinder::ceilometer')
       end
     end
@@ -63,7 +70,10 @@ describe 'tripleo::profile::base::cinder::api' do
       } }
 
       it 'should trigger complete configuration' do
-        is_expected.to contain_class('cinder::api')
+        is_expected.to contain_class('cinder::api').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('cinder::ceilometer')
       end
     end
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')