Merge "Remove deprecated cinder parameters"

manifests/profile/base/cinder/api.pp

@@ -58,14 +58,6 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# DEPRECATED PARAMETERS
-#
-# [*keymgr_api_class*]
-#   (Optional) Deprecated. The encryption key manager API class. The default value
-#   ensures Cinder's legacy key manager is enabled when no hiera value is
-#   specified.
-#   Defaults to undef.
-#
 class tripleo::profile::base::cinder::api (
   $bootstrap_node                = hiera('cinder_api_short_bootstrap_node_name', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
@@ -74,8 +66,6 @@ class tripleo::profile::base::cinder::api (
   $keymgr_backend                = hiera('cinder::api::keymgr_backend', 'cinder.keymgr.conf_key_mgr.ConfKeyManager'),
   $default_volume_type           = hiera('cinder::api::default_volume_type', ''),
   $step                          = Integer(hiera('step')),
-  # DEPRECATED PARAMETERS
-  $keymgr_api_class              = undef,
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -99,16 +89,9 @@ class tripleo::profile::base::cinder::api (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    if $keymgr_api_class {
-      warning('The keymgr_api_class parameter is deprecated, use keymgr_backend')
-      $keymgr_backend_real = $keymgr_api_class
-    } else {
-      $keymgr_backend_real = $keymgr_backend
-    }
-
     class { '::cinder::api':
       sync_db        => $sync_db,
-      keymgr_backend => $keymgr_backend_real,
+      keymgr_backend => $keymgr_backend,
     }
     include ::tripleo::profile::base::apache
     class { '::cinder::wsgi::apache':

manifests/profile/base/cinder/volume/dellemc_vnx.pp

@@ -45,7 +45,7 @@ class tripleo::profile::base::cinder::volume::dellemc_vnx (
       san_login                     => hiera('cinder::backend::emc_vnx::san_login', undef),
       san_password                  => hiera('cinder::backend::emc_vnx::san_password', undef),
       storage_protocol              => hiera('cinder::backend::emc_vnx::storage_protocol', undef),
-      storage_vnx_pool_names        => $storage_vnx_pool_names_real,
+      storage_vnx_pool_names        => hiera('cinder::backend::emc_vnx::storage_vnx_pool_names', undef),
       default_timeout               => hiera('cinder::backend::emc_vnx::default_timeout', undef),
       max_luns_per_storage_group    => hiera('cinder::backend::emc_vnx::max_luns_per_storage_group', undef),
       initiator_auto_registration   => hiera('cinder::backend::emc_vnx::initiator_auto_registration', undef),

manifests/profile/base/cinder/volume/dellsc.pp

@@ -33,15 +33,12 @@ class tripleo::profile::base::cinder::volume::dellsc (
 ) {
   include ::tripleo::profile::base::cinder::volume
 
-
   if $step >= 4 {
 
+    # Include support for 'excluded_domain_ip' until it's deprecated in THT
     $excluded_domain_ip = hiera('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef)
-    if $excluded_domain_ip == '' {
-      $excluded_domain_ip_real = undef
-    } else {
-      $excluded_domain_ip_real = $excluded_domain_ip
-    }
+    $excluded_domain_ips = hiera('cinder::backend::dellsc_iscsi::excluded_domain_ips', undef)
+    $excluded_domain_ips_real = pick_default($excluded_domain_ips, $excluded_domain_ip, undef)
 
     cinder::backend::dellsc_iscsi { $backend_name :
       backend_availability_zone    => hiera('cinder::backend::dellsc_iscsi::backend_availability_zone', undef),
@@ -54,8 +51,7 @@ class tripleo::profile::base::cinder::volume::dellsc (
       dell_sc_api_port             => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
       dell_sc_server_folder        => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
       dell_sc_volume_folder        => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
-      excluded_domain_ip           => $excluded_domain_ip_real,
-      excluded_domain_ips          => hiera('cinder::backend::dellsc_iscsi::excluded_domain_ips', undef),
+      excluded_domain_ips          => $excluded_domain_ips_real,
       secondary_san_ip             => hiera('cinder::backend::dellsc_iscsi::secondary_san_ip', undef),
       secondary_san_login          => hiera('cinder::backend::dellsc_iscsi::secondary_san_login', undef),
       secondary_san_password       => hiera('cinder::backend::dellsc_iscsi::secondary_san_password', undef),

spec/classes/tripleo_profile_base_cinder_api_spec.rb

@@ -96,19 +96,6 @@ describe 'tripleo::profile::base::cinder::api' do
         is_expected.to_not contain_cinder__type('tripleo')
       end
     end
-
-    context 'with deprecated keymgr parameters' do
-      let(:params) { {
-        :step             => 4,
-        :keymgr_api_class => 'some.other.key_manager',
-      } }
-
-      it 'should use deprecated keymgr parameters' do
-        is_expected.to contain_class('cinder::api').with(
-          :keymgr_backend => 'some.other.key_manager',
-        )
-      end
-    end
   end
 
   on_supported_os.each do |os, facts|