Remove deprecated keymgr_* parameters

These were deprecated during Xena cycle in favor of the new separate
classes to customize key manager[1].

[1] 6dc69ab67f

Change-Id: I8436c5afe3f971140d388e5690d1494b7a710355

manifests/init.pp

@@ -240,21 +240,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*keymgr_backend*]
-#   (Optional) Key Manager service class.
-#   Example of valid value: barbican
-#   Defaults to undef.
-#
-# [*keymgr_encryption_api_url*]
-#   (Optional) Key Manager service URL
-#   Example of valid value: https://localhost:9311/v1
-#   Defaults to undef.
-#
-# [*keymgr_encryption_auth_url*]
-#   (Optional) Auth URL for keymgr authentication. Should be in format
-#   http://auth_url:5000/v3
-#   Defaults to undef.
-#
 # [*enable_v3_api*]
 #   (Optional) Whether to enable the v3 API (true/false).
 #   Defaults to undef.
@@ -310,9 +295,6 @@ class cinder (
   $cinder_internal_tenant_project_id  = $::os_service_default,
   $cinder_internal_tenant_user_id     = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $keymgr_backend                     = undef,
-  $keymgr_encryption_api_url          = undef,
-  $keymgr_encryption_auth_url         = undef,
   $enable_v3_api                      = undef,
 ) inherits cinder::params {
 
@@ -400,18 +382,6 @@ class cinder (
     'DEFAULT/cinder_internal_tenant_user_id':    value => $cinder_internal_tenant_user_id;
   }
 
-  if $keymgr_backend != undef {
-    warning('The keymgr_backend parameter is deprecated. Use the cinder::key_manager class')
-    include cinder::key_manager
-  }
-
-  ['keymgr_encryption_api_url', 'keymgr_encryption_auth_url'].each |String $barbican_opt| {
-    if getvar("${barbican_opt}") != undef {
-      warning("The ${barbican_opt} parameter is deprecated. Use the cinder::key_manager::barbican class")
-    }
-    include cinder::key_manager::barbican
-  }
-
   oslo::concurrency { 'cinder_config':
     lock_path => $lock_path
   }

manifests/key_manager.pp

@@ -14,9 +14,7 @@ class cinder::key_manager (
 
   include cinder::deps
 
-  $backend_real = pick($cinder::keymgr_backend, $backend)
-
   oslo::key_manager { 'cinder_config':
-    backend => $backend_real,
+    backend => $backend,
   }
 }

manifests/key_manager/barbican.pp

@@ -50,13 +50,10 @@ class cinder::key_manager::barbican (
 
   include cinder::deps
 
-  $barbican_endpoint_real = pick($cinder::keymgr_encryption_api_url, $barbican_endpoint)
-  $auth_endpoint_real = pick($cinder::keymgr_encryption_auth_url, $auth_endpoint)
-
   oslo::key_manager::barbican { 'cinder_config':
-    barbican_endpoint       => $barbican_endpoint_real,
+    barbican_endpoint       => $barbican_endpoint,
     barbican_api_version    => $barbican_api_version,
-    auth_endpoint           => $auth_endpoint_real,
+    auth_endpoint           => $auth_endpoint,
     retry_delay             => $retry_delay,
     number_of_retries       => $number_of_retries,
     barbican_endpoint_type  => $barbican_endpoint_type,

releasenotes/notes/cleanup-keymgr-47715ecf4abcf266.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``cinder`` class have been removed.
+
+    - ``keymgr_backend``
+    - ``keymgr_encryption_api_url``
+    - ``keymgr_encryption_auth_url``

spec/classes/cinder_init_spec.rb

@@ -271,21 +271,6 @@ describe 'cinder' do
       )}
     end
 
-    context 'with keymgr parameters' do
-      let :params do
-        req_params.merge!({
-          :keymgr_backend             => 'barbican',
-          :keymgr_encryption_api_url  => 'https://localhost:9311/v1',
-          :keymgr_encryption_auth_url => 'https://localhost:5000/v3',
-        })
-      end
-      it 'should set keymgr parameters' do
-        is_expected.to contain_cinder_config('key_manager/backend').with_value('barbican')
-        is_expected.to contain_cinder_config('barbican/barbican_endpoint').with_value('https://localhost:9311/v1')
-        is_expected.to contain_cinder_config('barbican/auth_endpoint').with_value('https://localhost:5000/v3')
-      end
-    end
-
     context 'with volume api parameters' do
       let :params do
         req_params.merge!({