Merge "cinder: remove ineffective implementation about key_mgr_backend"

manifests/profile/base/cinder/api.pp

@@ -70,6 +70,10 @@ class tripleo::profile::base::cinder::api (
   # DEPRECATED PARAMETERS
   $keymgr_backend                = undef,
 ) {
+  if keymgr_backend != undef {
+    warning('The keymgr_backend parameter has been deprecated and has no effect.')
+  }
+
   if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
     $sync_db = true
   } else {
@@ -91,16 +95,8 @@ class tripleo::profile::base::cinder::api (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    if keymgr_backend != undef {
-      warning('The keymgr_backend parameter has been deprecated')
-      class { 'cinder::api':
-        sync_db        => $sync_db,
-        keymgr_backend => $keymgr_backend,
-      }
-    } else {
-      class { 'cinder::api':
-        sync_db => $sync_db,
-      }
+    class { 'cinder::api':
+      sync_db => $sync_db,
     }
     include tripleo::profile::base::apache
     class { 'cinder::wsgi::apache':

spec/classes/tripleo_profile_base_cinder_api_spec.rb

@@ -103,21 +103,6 @@ describe 'tripleo::profile::base::cinder::api' do
         is_expected.to contain_class('tripleo::profile::base::apache')
       end
     end
-
-    context 'with step 4 and deprecated keymgr parameters' do
-      let(:params) { {
-        :step           => 4,
-        :bootstrap_node => 'other.example.com',
-        :keymgr_backend => 'some.other.key_manager',
-      } }
-
-      it 'should set keymgr_backend' do
-        is_expected.to contain_class('cinder::api').with(
-          :sync_db        => false,
-          :keymgr_backend => 'some.other.key_manager',
-        )
-      end
-    end
   end
 
   on_supported_os.each do |os, facts|