Browse Source

Merge "Remove deprecated cinder parameters"

tags/11.2.0
Zuul 1 week ago
parent
commit
f959ea6889

+ 1
- 18
manifests/profile/base/cinder/api.pp View File

@@ -58,14 +58,6 @@
58 58
 #   for more details.
59 59
 #   Defaults to hiera('step')
60 60
 #
61
-# DEPRECATED PARAMETERS
62
-#
63
-# [*keymgr_api_class*]
64
-#   (Optional) Deprecated. The encryption key manager API class. The default value
65
-#   ensures Cinder's legacy key manager is enabled when no hiera value is
66
-#   specified.
67
-#   Defaults to undef.
68
-#
69 61
 class tripleo::profile::base::cinder::api (
70 62
   $bootstrap_node                = hiera('cinder_api_short_bootstrap_node_name', undef),
71 63
   $certificates_specs            = hiera('apache_certificates_specs', {}),
@@ -74,8 +66,6 @@ class tripleo::profile::base::cinder::api (
74 66
   $keymgr_backend                = hiera('cinder::api::keymgr_backend', 'cinder.keymgr.conf_key_mgr.ConfKeyManager'),
75 67
   $default_volume_type           = hiera('cinder::api::default_volume_type', ''),
76 68
   $step                          = Integer(hiera('step')),
77
-  # DEPRECATED PARAMETERS
78
-  $keymgr_api_class              = undef,
79 69
 ) {
80 70
   if $::hostname == downcase($bootstrap_node) {
81 71
     $sync_db = true
@@ -99,16 +89,9 @@ class tripleo::profile::base::cinder::api (
99 89
   }
100 90
 
101 91
   if $step >= 4 or ($step >= 3 and $sync_db) {
102
-    if $keymgr_api_class {
103
-      warning('The keymgr_api_class parameter is deprecated, use keymgr_backend')
104
-      $keymgr_backend_real = $keymgr_api_class
105
-    } else {
106
-      $keymgr_backend_real = $keymgr_backend
107
-    }
108
-
109 92
     class { '::cinder::api':
110 93
       sync_db        => $sync_db,
111
-      keymgr_backend => $keymgr_backend_real,
94
+      keymgr_backend => $keymgr_backend,
112 95
     }
113 96
     include ::tripleo::profile::base::apache
114 97
     class { '::cinder::wsgi::apache':

+ 1
- 1
manifests/profile/base/cinder/volume/dellemc_vnx.pp View File

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

+ 4
- 8
manifests/profile/base/cinder/volume/dellsc.pp View File

@@ -33,15 +33,12 @@ class tripleo::profile::base::cinder::volume::dellsc (
33 33
 ) {
34 34
   include ::tripleo::profile::base::cinder::volume
35 35
 
36
-
37 36
   if $step >= 4 {
38 37
 
38
+    # Include support for 'excluded_domain_ip' until it's deprecated in THT
39 39
     $excluded_domain_ip = hiera('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef)
40
-    if $excluded_domain_ip == '' {
41
-      $excluded_domain_ip_real = undef
42
-    } else {
43
-      $excluded_domain_ip_real = $excluded_domain_ip
44
-    }
40
+    $excluded_domain_ips = hiera('cinder::backend::dellsc_iscsi::excluded_domain_ips', undef)
41
+    $excluded_domain_ips_real = pick_default($excluded_domain_ips, $excluded_domain_ip, undef)
45 42
 
46 43
     cinder::backend::dellsc_iscsi { $backend_name :
47 44
       backend_availability_zone    => hiera('cinder::backend::dellsc_iscsi::backend_availability_zone', undef),
@@ -54,8 +51,7 @@ class tripleo::profile::base::cinder::volume::dellsc (
54 51
       dell_sc_api_port             => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
55 52
       dell_sc_server_folder        => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
56 53
       dell_sc_volume_folder        => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
57
-      excluded_domain_ip           => $excluded_domain_ip_real,
58
-      excluded_domain_ips          => hiera('cinder::backend::dellsc_iscsi::excluded_domain_ips', undef),
54
+      excluded_domain_ips          => $excluded_domain_ips_real,
59 55
       secondary_san_ip             => hiera('cinder::backend::dellsc_iscsi::secondary_san_ip', undef),
60 56
       secondary_san_login          => hiera('cinder::backend::dellsc_iscsi::secondary_san_login', undef),
61 57
       secondary_san_password       => hiera('cinder::backend::dellsc_iscsi::secondary_san_password', undef),

+ 0
- 13
spec/classes/tripleo_profile_base_cinder_api_spec.rb View File

@@ -96,19 +96,6 @@ describe 'tripleo::profile::base::cinder::api' do
96 96
         is_expected.to_not contain_cinder__type('tripleo')
97 97
       end
98 98
     end
99
-
100
-    context 'with deprecated keymgr parameters' do
101
-      let(:params) { {
102
-        :step             => 4,
103
-        :keymgr_api_class => 'some.other.key_manager',
104
-      } }
105
-
106
-      it 'should use deprecated keymgr parameters' do
107
-        is_expected.to contain_class('cinder::api').with(
108
-          :keymgr_backend => 'some.other.key_manager',
109
-        )
110
-      end
111
-    end
112 99
   end
113 100
 
114 101
   on_supported_os.each do |os, facts|

Loading…
Cancel
Save