Browse Source

Merge "Remove deprecated params and drivers"

changes/36/682936/1
Zuul 1 week ago
parent
commit
d004949ac8

+ 1
- 65
manifests/api.pp View File

@@ -124,40 +124,6 @@
124 124
 #   Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager
125 125
 #   Defaults to 'cinder.keymgr.conf_key_mgr.ConfKeyManager'.
126 126
 #
127
-# DEPRECATED PARAMETERS
128
-#
129
-# [*keymgr_api_class*]
130
-#   (optional) Deprecated. Key Manager service class.
131
-#   Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager
132
-#   Defaults to undef.
133
-#
134
-# [*nova_catalog_info*]
135
-#   (optional) Match this value when searching for nova in the service
136
-#   catalog.
137
-#   Defaults to undef.
138
-#
139
-# [*os_privileged_user_name*]
140
-#   (optional) OpenStack privileged account username. Used for requests to
141
-#   other services (such as Nova) that require an account with
142
-#   special rights.
143
-#   Defaults to undef.
144
-#
145
-# [*os_privileged_user_password*]
146
-#   (optional) Password associated with the OpenStack privileged account.
147
-#   Defaults to undef.
148
-#
149
-# [*os_privileged_user_tenant*]
150
-#   (optional) Tenant name associated with the OpenStack privileged account.
151
-#   Defaults to undef.
152
-#
153
-# [*os_privileged_user_auth_url*]
154
-#   (optional) Auth URL associated with the OpenStack privileged account.
155
-#   Defaults to undef.
156
-#
157
-# [*privileged_user*]
158
-#   (optional) Enables OpenStack privileged account.
159
-#   Defaults to undef.
160
-#
161 127
 class cinder::api (
162 128
   $os_region_name                 = $::os_service_default,
163 129
   $keymgr_encryption_api_url      = $::os_service_default,
@@ -186,14 +152,6 @@ class cinder::api (
186 152
   $auth_strategy                  = 'keystone',
187 153
   $osapi_volume_listen_port       = $::os_service_default,
188 154
   $keymgr_backend                 = 'cinder.keymgr.conf_key_mgr.ConfKeyManager',
189
-  # DEPRECATED PARAMETERS
190
-  $keymgr_api_class               = undef,
191
-  $nova_catalog_info              = undef,
192
-  $os_privileged_user_name        = undef,
193
-  $os_privileged_user_password    = undef,
194
-  $os_privileged_user_tenant      = undef,
195
-  $os_privileged_user_auth_url    = undef,
196
-  $privileged_user                = undef,
197 155
 ) inherits cinder::params {
198 156
 
199 157
   include ::cinder::deps
@@ -203,21 +161,6 @@ class cinder::api (
203 161
   validate_legacy(Boolean, 'validate_bool', $manage_service)
204 162
   validate_legacy(Boolean, 'validate_bool', $enabled)
205 163
 
206
-  $deprecated_param_names = [
207
-    'nova_catalog_info',
208
-    'privileged_user',
209
-    'os_privileged_user_name',
210
-    'os_privileged_user_password',
211
-    'os_privileged_user_tenant',
212
-    'os_privileged_user_auth_url',
213
-  ]
214
-  $deprecated_param_names.each |$param_name| {
215
-    $param = getvar($param_name)
216
-    if $param != undef{
217
-      warning("The ${param_name} parameter is deprecated, has no effect and will be removed in the future release.")
218
-    }
219
-  }
220
-
221 164
   if $use_ssl {
222 165
     if is_service_default($cert_file) {
223 166
       fail('The cert_file parameter is required when use_ssl is set to true')
@@ -227,13 +170,6 @@ class cinder::api (
227 170
     }
228 171
   }
229 172
 
230
-  if $keymgr_api_class {
231
-    warning('The keymgr_api_class parameter is deprecated, use keymgr_backend')
232
-    $keymgr_backend_real = $keymgr_api_class
233
-  } else {
234
-    $keymgr_backend_real = $keymgr_backend
235
-  }
236
-
237 173
   if $::cinder::params::api_package {
238 174
     package { 'cinder-api':
239 175
       ensure => $package_ensure,
@@ -300,7 +236,7 @@ running as a standalone service, or httpd for being run by a httpd server")
300 236
   }
301 237
 
302 238
   cinder_config {
303
-    'key_manager/backend':        value => $keymgr_backend_real;
239
+    'key_manager/backend':        value => $keymgr_backend;
304 240
     'barbican/barbican_endpoint': value => $keymgr_encryption_api_url;
305 241
     'barbican/auth_endpoint':     value => $keymgr_encryption_auth_url;
306 242
   }

+ 0
- 200
manifests/backend/bdd.pp View File

@@ -1,200 +0,0 @@
1
-#
2
-# Define: cinder::backend::bdd
3
-#
4
-# This class activate Cinder Block Device driver backend
5
-#
6
-# === Parameters:
7
-#
8
-# [*available_devices*]
9
-#   (Required) List of all available devices. Real hard disks.
10
-#   Should be a string.
11
-#
12
-# [*target_ip_address*]
13
-#   (optional) The IP address that the iSCSI daemon is listening on.
14
-#   If not set, the iscsi_ip_address must be specified. The target_ip_address
15
-#   will be required once the deprecated iscsi_ip_address parameter is
16
-#   removed in a future release.
17
-#   Defaults to undef.
18
-#
19
-# [*volume_backend_name*]
20
-#   (optional) Allows for the volume_backend_name to be separate of $name.
21
-#   Defaults to: $name
22
-#
23
-# [*backend_availability_zone*]
24
-#   (Optional) Availability zone for this volume backend.
25
-#   If not set, the storage_availability_zone option value
26
-#   is used as the default for all backends.
27
-#   Defaults to $::os_service_default.
28
-#
29
-# [*volume_driver*]
30
-#   (Optional) Driver to use for volume creation
31
-#   Defaults to 'cinder.volume.drivers.block_device.BlockDeviceDriver'.
32
-#
33
-# [*volume_group*]
34
-#   (Optional) Name for the VG that will contain exported volumes
35
-#   Defaults to $::os_service_default
36
-#
37
-# [*volumes_dir*]
38
-#   (Optional) Volume configuration file storage directory
39
-#   Defaults to '/var/lib/cinder/volumes'.
40
-#
41
-# [*target_helper*]
42
-#   (Optional) iSCSI target user-land tool to use.
43
-#   Defaults to tgtadm.
44
-#
45
-# [*target_protocol*]
46
-#   (Optional) Protocol to use as iSCSI driver
47
-#   Defaults to $::os_service_default.
48
-#
49
-# [*volume_clear*]
50
-#   (Optional) Method used to wipe old volumes
51
-#   Defaults to $::os_service_default.
52
-#
53
-# [*manage_volume_type*]
54
-#   (Optional) Whether or not manage Cinder Volume type.
55
-#   If set to true, a Cinder Volume type will be created
56
-#   with volume_backend_name=$volume_backend_name key/value.
57
-#   Defaults to false.
58
-#
59
-# [*extra_options*]
60
-#   (optional) Hash of extra options to pass to the backend
61
-#   Defaults to: {}
62
-#   Example :
63
-#     { 'bdd_backend/param1' => { 'value' => value1 } }
64
-#
65
-# === Examples
66
-#
67
-#  cinder::backend::bdd { 'myBDDbackend':
68
-#    iscsi_ip_address  => '10.20.0.2',
69
-#    available_devices => '/dev/sda,/dev/sdb'
70
-#  }
71
-#
72
-# DEPRECATED PARAMETERS
73
-#
74
-# [*iscsi_ip_address*]
75
-#   (Optional) The IP address that the iSCSI daemon is listening on
76
-#   Defaults to undef.
77
-#
78
-# [*iscsi_helper*]
79
-#   (Optional) iSCSI target user-land tool to use.
80
-#   Defaults to undef.
81
-#
82
-# [*iscsi_protocol*]
83
-#   (Optional) Protocol to use as iSCSI driver
84
-#   Defaults to undef.
85
-#
86
-# === Authors
87
-#
88
-# Denis Egorenko <degorenko@mirantis.com>
89
-#
90
-define cinder::backend::bdd (
91
-  $available_devices,
92
-  $target_ip_address         = undef,
93
-  $volume_backend_name       = $name,
94
-  $backend_availability_zone = $::os_service_default,
95
-  $volume_driver             = 'cinder.volume.drivers.block_device.BlockDeviceDriver',
96
-  $volume_group              = $::os_service_default,
97
-  $volumes_dir               = '/var/lib/cinder/volumes',
98
-  $target_helper             = 'tgtadm',
99
-  $target_protocol           = $::os_service_default,
100
-  $volume_clear              = $::os_service_default,
101
-  $manage_volume_type        = false,
102
-  $extra_options             = {},
103
-  # DEPRECATED PARAMETERS
104
-  $iscsi_ip_address          = undef,
105
-  $iscsi_helper              = undef,
106
-  $iscsi_protocol            = undef,
107
-) {
108
-
109
-  include ::cinder::deps
110
-  include ::cinder::params
111
-
112
-  if ($volume_driver == 'cinder.volume.drivers.block_device.BlockDeviceDriver') {
113
-    warning('Cinder block device driver is deprecated. Please use LVM backend')
114
-  }
115
-
116
-  if $target_ip_address or $iscsi_ip_address {
117
-    if $iscsi_ip_address {
118
-      warning('The iscsi_ip_address parameter is deprecated, use target_ip_address instead.')
119
-    }
120
-    $target_ip_address_real = pick($target_ip_address, $iscsi_ip_address)
121
-  } else {
122
-    fail('A target_ip_address or iscsi_ip_address must be specified.')
123
-  }
124
-
125
-  if $iscsi_helper {
126
-    warning('The iscsi_helper parameter is deprecated, use target_helper instead.')
127
-    $target_helper_real = $iscsi_helper
128
-  } else {
129
-    $target_helper_real = $target_helper
130
-  }
131
-
132
-  if $iscsi_protocol {
133
-    warning('The iscsi_protocol parameter is deprecated, use target_protocol instead.')
134
-    $target_protocol_real = $iscsi_protocol
135
-  } else {
136
-    $target_protocol_real = $target_protocol
137
-  }
138
-
139
-  cinder_config {
140
-    "${name}/available_devices":         value => $available_devices;
141
-    "${name}/volume_backend_name":       value => $volume_backend_name;
142
-    "${name}/backend_availability_zone": value => $backend_availability_zone;
143
-    "${name}/volume_driver":             value => $volume_driver;
144
-    "${name}/target_ip_address":         value => $target_ip_address_real;
145
-    "${name}/target_helper":             value => $target_helper_real;
146
-    "${name}/volume_group":              value => $volume_group;
147
-    "${name}/volumes_dir":               value => $volumes_dir;
148
-    "${name}/target_protocol":           value => $target_protocol_real;
149
-    "${name}/volume_clear":              value => $volume_clear;
150
-  }
151
-
152
-  if $manage_volume_type {
153
-    cinder_type { $volume_backend_name:
154
-      ensure     => present,
155
-      properties => ["volume_backend_name=${volume_backend_name}"],
156
-    }
157
-  }
158
-
159
-  create_resources('cinder_config', $extra_options)
160
-
161
-  case $target_helper_real {
162
-    'tgtadm': {
163
-      ensure_packages('tgt', {
164
-        ensure => present,
165
-        name   => $::cinder::params::tgt_package_name,
166
-        tag    => 'cinder-support-package'})
167
-
168
-      ensure_resource('service', 'tgtd', {
169
-        ensure => running,
170
-        name   => $::cinder::params::tgt_service_name,
171
-        tag    => 'cinder-support-service'})
172
-
173
-      if($::osfamily == 'RedHat') {
174
-        ensure_resource('file_line', 'cinder include', {
175
-          path    => '/etc/tgt/targets.conf',
176
-          line    => "include ${volumes_dir}/*",
177
-          match   => '#?include /',
178
-          require => Anchor['cinder::install::end'],
179
-          notify  => Anchor['cinder::service::begin']})
180
-      }
181
-    }
182
-
183
-    'lioadm': {
184
-      ensure_packages('targetcli', {
185
-        ensure => present,
186
-        name   => $::cinder::params::lio_package_name,
187
-        tag    => 'cinder-support-package'})
188
-
189
-      ensure_resource('service', 'target', {
190
-        ensure => running,
191
-        enable => true,
192
-        tag    => 'cinder-support-service'})
193
-    }
194
-
195
-    default: {
196
-      fail("Unsupported target helper: ${target_helper_real}.")
197
-    }
198
-  }
199
-
200
-}

+ 5
- 43
manifests/backend/dellsc_iscsi.pp View File

@@ -18,9 +18,6 @@
18 18
 #
19 19
 # [*target_ip_address*]
20 20
 #   (optional) The IP address that the iSCSI daemon is listening on.
21
-#   If not set, the iscsi_ip_address must be specified. The target_ip_address
22
-#   will be required once the deprecated iscsi_ip_address parameter is
23
-#   removed in a future release.
24 21
 #   Defaults to undef.
25 22
 #
26 23
 # [*volume_backend_name*]
@@ -90,19 +87,6 @@
90 87
 #   (Optional) Enables multipath configuration.
91 88
 #   Defaults to true.
92 89
 #
93
-# DEPRECATED PARAMETERS
94
-# [*excluded_domain_ip*]
95
-#   (optional) Domain IP to be excluded from iSCSI returns of Storage Center.
96
-#   Defaults to undef.
97
-#
98
-# [*iscsi_ip_address*]
99
-#   (Optional) The IP address that the iSCSI daemon is listening on
100
-#   Defaults to undef.
101
-#
102
-# [*iscsi_port*]
103
-#   (Optional) iSCSI target user-land tool to use.
104
-#   Defaults to undef.
105
-#
106 90
 define cinder::backend::dellsc_iscsi (
107 91
   $san_ip,
108 92
   $san_login,
@@ -124,10 +108,6 @@ define cinder::backend::dellsc_iscsi (
124 108
   $manage_volume_type           = false,
125 109
   $use_multipath_for_image_xfer = true,
126 110
   $extra_options                = {},
127
-  # DEPRECATED PARAMETERS
128
-  $excluded_domain_ip           = undef,
129
-  $iscsi_ip_address             = undef,
130
-  $iscsi_port                   = undef,
131 111
 ) {
132 112
 
133 113
   include ::cinder::deps
@@ -142,22 +122,6 @@ default of \"srv\" and will be changed to the upstream OpenStack default in N-re
142 122
 default of \"vol\" and will be changed to the upstream OpenStack default in N-release.")
143 123
   }
144 124
 
145
-  if $target_ip_address or $iscsi_ip_address {
146
-    if $iscsi_ip_address {
147
-      warning('The iscsi_ip_address parameter is deprecated, use target_ip_address instead.')
148
-    }
149
-    $target_ip_address_real = pick($target_ip_address, $iscsi_ip_address)
150
-  } else {
151
-    fail('A target_ip_address or iscsi_ip_address must be specified.')
152
-  }
153
-
154
-  if $iscsi_port {
155
-    warning('The iscsi_port parameter is deprecated, use target_port instead.')
156
-    $target_port_real = $iscsi_port
157
-  } else {
158
-    $target_port_real = $target_port
159
-  }
160
-
161 125
   $driver = 'dell_emc.sc.storagecenter_iscsi.SCISCSIDriver'
162 126
   cinder_config {
163 127
     "${name}/volume_backend_name":          value => $volume_backend_name;
@@ -166,13 +130,13 @@ default of \"vol\" and will be changed to the upstream OpenStack default in N-re
166 130
     "${name}/san_ip":                       value => $san_ip;
167 131
     "${name}/san_login":                    value => $san_login;
168 132
     "${name}/san_password":                 value => $san_password, secret => true;
169
-    "${name}/target_ip_address":            value => $target_ip_address_real;
133
+    "${name}/target_ip_address":            value => $target_ip_address;
170 134
     "${name}/dell_sc_ssn":                  value => $dell_sc_ssn;
171 135
     "${name}/dell_sc_api_port":             value => $dell_sc_api_port;
172 136
     "${name}/dell_sc_server_folder":        value => $dell_sc_server_folder;
173 137
     "${name}/dell_sc_verify_cert":          value => $dell_sc_verify_cert;
174 138
     "${name}/dell_sc_volume_folder":        value => $dell_sc_volume_folder;
175
-    "${name}/target_port":                  value => $target_port_real;
139
+    "${name}/target_port":                  value => $target_port;
176 140
     "${name}/excluded_domain_ips":          value => $excluded_domain_ips;
177 141
     "${name}/secondary_san_ip":             value => $secondary_san_ip;
178 142
     "${name}/secondary_san_login":          value => $secondary_san_login;
@@ -181,11 +145,9 @@ default of \"vol\" and will be changed to the upstream OpenStack default in N-re
181 145
     "${name}/use_multipath_for_image_xfer": value => $use_multipath_for_image_xfer;
182 146
   }
183 147
 
184
-  if $excluded_domain_ip {
185
-    warning('The excluded_domain_ip is deprecated. Please use excluded_domain_ips instead.')
186
-    cinder_config {
187
-      "${name}/excluded_domain_ip": value => $excluded_domain_ip;
188
-    }
148
+  # TODO(tobias-urdin): Remove this in U release.
149
+  cinder_config {
150
+    "${name}/excluded_domain_ip": ensure => absent;
189 151
   }
190 152
 
191 153
   if $manage_volume_type {

+ 1
- 13
manifests/backend/emc_vnx.pp View File

@@ -79,11 +79,6 @@
79 79
 #   with volume_backend_name=$volume_backend_name key/value.
80 80
 #   Defaults to false.
81 81
 #
82
-# DEPRECATED PARAMETERS
83
-#
84
-# [*storage_vnx_pool_name*]
85
-#   (required) Storage pool name.
86
-#
87 82
 define cinder::backend::emc_vnx (
88 83
   $san_ip,
89 84
   $san_password,
@@ -102,18 +97,11 @@ define cinder::backend::emc_vnx (
102 97
   $storage_vnx_security_file_dir = $::os_service_default,
103 98
   $naviseccli_path               = $::os_service_default,
104 99
   $manage_volume_type            = false,
105
-  # DEPRECATED PARAMETERS
106
-  $storage_vnx_pool_name         = undef,
107 100
 ) {
108 101
 
109 102
   include ::cinder::deps
110 103
   include ::cinder::params
111 104
 
112
-  if $storage_vnx_pool_name {
113
-    warning('The storage_vnx_pool_name parameter is deprecated. Please use storage_vnx_pool_names instead.')
114
-  }
115
-  $storage_vnx_pool_names_real = pick($storage_vnx_pool_name, $storage_vnx_pool_names)
116
-
117 105
   cinder_config {
118 106
     "${name}/default_timeout":                 value => $default_timeout;
119 107
     "${name}/max_luns_per_storage_group":      value => $max_luns_per_storage_group;
@@ -121,7 +109,7 @@ define cinder::backend::emc_vnx (
121 109
     "${name}/san_ip":                          value => $san_ip;
122 110
     "${name}/san_login":                       value => $san_login;
123 111
     "${name}/san_password":                    value => $san_password, secret => true;
124
-    "${name}/storage_vnx_pool_names":          value => $storage_vnx_pool_names_real;
112
+    "${name}/storage_vnx_pool_names":          value => $storage_vnx_pool_names;
125 113
     "${name}/volume_backend_name":             value => $volume_backend_name;
126 114
     "${name}/backend_availability_zone":       value => $backend_availability_zone;
127 115
     "${name}/volume_driver":                   value => $volume_driver;

+ 5
- 49
manifests/backend/iscsi.pp View File

@@ -5,9 +5,6 @@
5 5
 #
6 6
 # [*target_ip_address*]
7 7
 #   (optional) The IP address that the iSCSI daemon is listening on.
8
-#   If not set, the iscsi_ip_address must be specified. The target_ip_address
9
-#   will be required once the deprecated iscsi_ip_address parameter is
10
-#   removed in a future release.
11 8
 #   Defaults to undef.
12 9
 #
13 10
 # [*volume_backend_name*]
@@ -52,20 +49,6 @@
52 49
 #   Example :
53 50
 #     { 'iscsi_backend/param1' => { 'value' => value1 } }
54 51
 #
55
-# DEPRECATED PARAMETERS
56
-#
57
-# [*iscsi_ip_address*]
58
-#   (Optional) The IP address that the iSCSI daemon is listening on
59
-#   Defaults to undef.
60
-#
61
-# [*iscsi_helper*]
62
-#   (Optional) iSCSI target user-land tool to use.
63
-#   Defaults to undef.
64
-#
65
-# [*iscsi_protocol*]
66
-#   (Optional) Protocol to use as iSCSI driver
67
-#   Defaults to undef.
68
-#
69 52
 define cinder::backend::iscsi (
70 53
   $target_ip_address         = undef,
71 54
   $volume_backend_name       = $name,
@@ -77,10 +60,6 @@ define cinder::backend::iscsi (
77 60
   $target_protocol           = $::os_service_default,
78 61
   $manage_volume_type        = false,
79 62
   $extra_options             = {},
80
-  # DEPRECATED PARAMETERS
81
-  $iscsi_ip_address          = undef,
82
-  $iscsi_helper              = undef,
83
-  $iscsi_protocol            = undef,
84 63
 ) {
85 64
 
86 65
   include ::cinder::deps
@@ -97,38 +76,15 @@ define cinder::backend::iscsi (
97 76
     }
98 77
   }
99 78
 
100
-  if $target_ip_address or $iscsi_ip_address {
101
-    if $iscsi_ip_address {
102
-      warning('The iscsi_ip_address parameter is deprecated, use target_ip_address instead.')
103
-    }
104
-    $target_ip_address_real = pick($target_ip_address, $iscsi_ip_address)
105
-  } else {
106
-    fail('A target_ip_address or iscsi_ip_address must be specified.')
107
-  }
108
-
109
-  if $iscsi_helper {
110
-    warning('The iscsi_helper parameter is deprecated, use target_helper instead.')
111
-    $target_helper_real = $iscsi_helper
112
-  } else {
113
-    $target_helper_real = $target_helper
114
-  }
115
-
116
-  if $iscsi_protocol {
117
-    warning('The iscsi_protocol parameter is deprecated, use target_protocol instead.')
118
-    $target_protocol_real = $iscsi_protocol
119
-  } else {
120
-    $target_protocol_real = $target_protocol
121
-  }
122
-
123 79
   cinder_config {
124 80
     "${name}/volume_backend_name":        value => $volume_backend_name;
125 81
     "${name}/backend_availability_zone":  value => $backend_availability_zone;
126 82
     "${name}/volume_driver":              value => $volume_driver;
127
-    "${name}/target_ip_address":          value => $target_ip_address_real;
128
-    "${name}/target_helper":              value => $target_helper_real;
83
+    "${name}/target_ip_address":          value => $target_ip_address;
84
+    "${name}/target_helper":              value => $target_helper;
129 85
     "${name}/volume_group":               value => $volume_group;
130 86
     "${name}/volumes_dir":                value => $volumes_dir;
131
-    "${name}/target_protocol":            value => $target_protocol_real;
87
+    "${name}/target_protocol":            value => $target_protocol;
132 88
   }
133 89
 
134 90
   if $manage_volume_type {
@@ -140,7 +96,7 @@ define cinder::backend::iscsi (
140 96
 
141 97
   create_resources('cinder_config', $extra_options)
142 98
 
143
-  case $target_helper_real {
99
+  case $target_helper {
144 100
     'tgtadm': {
145 101
       package { 'tgt':
146 102
         ensure => present,
@@ -181,7 +137,7 @@ define cinder::backend::iscsi (
181 137
     }
182 138
 
183 139
     default: {
184
-      fail("Unsupported target helper: ${target_helper_real}.")
140
+      fail("Unsupported target helper: ${target_helper}.")
185 141
     }
186 142
   }
187 143
 

+ 4
- 9
manifests/ceilometer.pp View File

@@ -1,26 +1,21 @@
1 1
 # == Class: cinder::ceilometer
2 2
 #
3 3
 # Setup Cinder to enable ceilometer can retrieve volume samples
4
-# Ref: https://docs.openstack.org/ceilometer/latest/install/manual.html
5 4
 #
6 5
 # === Parameters
7 6
 #
8 7
 # [*notification_transport_url*]
9
-#   (optional) A URL representing the messaging driver to use for notifications
8
+#   (Optional) A URL representing the messaging driver to use for notifications
10 9
 #   and its full configuration. Transport URLs take the form:
11 10
 #     transport://user:pass@host1:port[,hostN:portN]/virtual_host
12 11
 #   Defaults to $::os_service_default
13 12
 #
14 13
 # [*notification_driver*]
15
-#   (option) Driver or drivers to handle sending notifications.
16
-#   The default value of 'messagingv2' is for enabling notifications via
17
-#   oslo.messaging.  'cinder.openstack.common.notifier.rpc_notifier' is the
18
-#   backwards compatible option that will be deprecated. Prior to Grizzly,
19
-#   'cinder.openstack.common.notifier.rabbit_notifier' was used. oslo.messaging
20
-#   was adopted in icehouse/juno. See LP#1425713.
14
+#   (Option) Driver or drivers to handle sending notifications.
15
+#   Defaults to 'messagingv2'
21 16
 #
22 17
 # [*notification_topics*]
23
-#   (optional) AMQP topic used for OpenStack notifications
18
+#   (Optional) AMQP topic used for OpenStack notifications
24 19
 #   Defaults to $::os_service_default
25 20
 #
26 21
 class cinder::ceilometer (

+ 0
- 12
manifests/glance.pp View File

@@ -29,12 +29,6 @@
29 29
 #   (optional) http/https timeout value for glance operations.
30 30
 #   Defaults to $::os_service_default
31 31
 #
32
-# DEPRECATED PARAMETERS
33
-#
34
-# [*glance_api_version*]
35
-#   (optional) Glance API version.
36
-#   Defaults to undef.
37
-#
38 32
 # === Author(s)
39 33
 #
40 34
 # Emilien Macchi <emilien.macchi@enovance.com>
@@ -61,16 +55,10 @@ class cinder::glance (
61 55
   $glance_api_insecure        = $::os_service_default,
62 56
   $glance_api_ssl_compression = $::os_service_default,
63 57
   $glance_request_timeout     = $::os_service_default,
64
-  # DEPRECATED PARAMETERS
65
-  $glance_api_version         = undef,
66 58
 ) {
67 59
 
68 60
   include ::cinder::deps
69 61
 
70
-  if $glance_api_version != undef {
71
-    warning('The glance_api_version parameter is deprecated, has no effect and will be removed in the future release.')
72
-  }
73
-
74 62
   cinder_config {
75 63
     'DEFAULT/glance_api_servers':         value => join(any2array($glance_api_servers), ',');
76 64
     'DEFAULT/glance_num_retries':         value => $glance_num_retries;

+ 0
- 58
manifests/keystone/auth.pp View File

@@ -161,40 +161,6 @@
161 161
 #    admin_url    => 'https://10.0.0.30:8776/v3/%(tenant_id)s',
162 162
 #  }
163 163
 #
164
-# DEPRECATED PARAMETERS
165
-#
166
-# [*configure_endpoint*]
167
-#   (Optional) Should Cinder v1 endpoint be configured?
168
-#   API v1 was removed in Queens.
169
-#   Defaults to undef
170
-#
171
-# [*public_url*]
172
-#   (Optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:8776/v1/%(tenant_id)s')
173
-#   This url should *not* contain any trailing '/'.
174
-#   Defaults to undef
175
-#
176
-# [*internal_url*]
177
-#   (Optional) The endpoint's internal url.
178
-#   This url should *not* contain any trailing '/'.
179
-#   Defaults to undef
180
-#
181
-# [*admin_url*]
182
-#   (Optional) The endpoint's admin url.
183
-#   This url should *not* contain any trailing '/'.
184
-#   Defaults to undef
185
-#
186
-# [*service_name*]
187
-#   (Optional) Name of the service.
188
-#   Defaults to undef
189
-#
190
-# [*service_type*]
191
-#   (Optional) Type of service.
192
-#   Defaults to undef
193
-#
194
-# [*service_description*]
195
-#   (Optional) Description for keystone service.
196
-#   Defaults to undef
197
-#
198 164
 class cinder::keystone::auth (
199 165
   $password,
200 166
   $password_user_v2       = undef,
@@ -232,34 +198,10 @@ class cinder::keystone::auth (
232 198
   $service_description_v2 = 'Cinder Service v2',
233 199
   $service_description_v3 = 'Cinder Service v3',
234 200
   $region                 = 'RegionOne',
235
-  # DEPRECATED PARAMETERS
236
-  $configure_endpoint     = undef,
237
-  $public_url             = undef,
238
-  $internal_url           = undef,
239
-  $admin_url              = undef,
240
-  $service_name           = undef,
241
-  $service_type           = undef,
242
-  $service_description    = undef,
243 201
 ) {
244 202
 
245 203
   include ::cinder::deps
246 204
 
247
-  $deprecated_param_names = [
248
-    'configure_endpoint',
249
-    'public_url',
250
-    'internal_url',
251
-    'admin_url',
252
-    'service_name',
253
-    'service_type',
254
-    'service_description',
255
-  ]
256
-  $deprecated_param_names.each |$param_name| {
257
-    $param = getvar($param_name)
258
-    if $param != undef{
259
-      warning("The ${param_name} parameter is deprecated, has no effect and will be removed in the future release.")
260
-    }
261
-  }
262
-
263 205
   if $configure_endpoint_v2 {
264 206
     Keystone_endpoint["${region}/${service_name_v2}::${service_type_v2}"] -> Anchor['cinder::service::end']
265 207
   }

+ 2
- 0
manifests/type.pp View File

@@ -24,6 +24,8 @@ define cinder::type (
24 24
 
25 25
   include ::cinder::deps
26 26
 
27
+  warning('The cinder::type is deprecated, please use the cinder_type resource.')
28
+
27 29
   if ($set_value and $set_key) {
28 30
     if is_array($set_value) {
29 31
       $value = join($set_value, ',')

+ 2
- 0
manifests/type_set.pp View File

@@ -24,6 +24,8 @@ define cinder::type_set (
24 24
 
25 25
   include ::cinder::deps
26 26
 
27
+  warning('The cinder::type_set class is deprecated, please use the cinder_type resource instead.')
28
+
27 29
   cinder_type { $type:
28 30
     ensure     => present,
29 31
     properties => ["${key}=${value}"],

+ 34
- 0
releasenotes/notes/remove-deprecated-params-b1a3fa4eda688331.yaml View File

@@ -0,0 +1,34 @@
1
+---
2
+upgrade:
3
+  - |
4
+    The deprecated parameter cinder::api::keymgr_api_class is removed.
5
+    Please use the cinder::api::keymgr_backend parameter.
6
+  - |
7
+    The deprecated parameters nova_catalog_info, os_privileged_user_name,
8
+    os_privileged_user_password, os_privileged_user_tenant, os_privileged_user_auth_url
9
+    and privileged_user in cinder::api is removed.
10
+  - |
11
+    The deprecated cinder::backend::bdd block device driver is removed.
12
+  - |
13
+    The deprecated parameters excluded_domain_ip, iscsi_ip_address and iscsi_port in
14
+    cinder::backend::dellsc_iscsi is removed.
15
+    Please use the excluded_domain_ips, target_ip_address and target_port parameters.
16
+  - |
17
+    The deprecated parameter storage_vnx_pool_name in cinder::backend::emc_vnx is removed.
18
+    Please use the storage_vnx_pool_names parameter.
19
+  - |
20
+    The deprecated parameters iscsi_ip_address, iscsi_helper and iscsi_protocol in
21
+    cinder::backend::iscsi is removed. Please use target_ip_address, target_helper
22
+    and target_protocol.
23
+  - |
24
+    The deprecated parameter cinder::glance::glance_api_version is removed.
25
+  - |
26
+    The deprecated parameters configure_endpoint, public_url, internal_url, admin_url,
27
+    service_name, service_type and service_description in cinder::keystone::auth is removed.
28
+    These were used to configure Cinder V1 which is removed, see corresponding parameters
29
+    for Cinder V2 and Cinder V3.
30
+deprecations:
31
+  - |
32
+    The cinder::type_set class is deprecated, please use the cinder_type resource.
33
+  - |
34
+    The cinder::type class is deprecated, please use the cinder_type resource.

+ 0
- 33
spec/classes/cinder_api_spec.rb View File

@@ -30,8 +30,6 @@ describe 'cinder::api' do
30 30
         is_expected.to contain_cinder_config('DEFAULT/osapi_volume_workers').with(
31 31
          :value => '8'
32 32
         )
33
-        # nova_catalog_info has been deprecated
34
-        is_expected.not_to contain_cinder_config('DEFAULT/nova_catalog_info')
35 33
         is_expected.to contain_cinder_config('DEFAULT/default_volume_type').with(
36 34
          :value => '<SERVICE DEFAULT>'
37 35
         )
@@ -62,26 +60,6 @@ describe 'cinder::api' do
62 60
       end
63 61
     end
64 62
 
65
-    context 'with deprecated parameters' do
66
-      let :params do
67
-        req_params.merge({
68
-          'nova_catalog_info'           => 'compute:nova:publicURL',
69
-          'os_privileged_user_name'     => 'admin',
70
-          'os_privileged_user_password' => 'password',
71
-          'os_privileged_user_tenant'   => 'admin',
72
-          'os_privileged_user_auth_url' => 'http://localhost:8080',
73
-        })
74
-      end
75
-      it 'should not add them to the config' do
76
-        is_expected.not_to contain_cinder_config('DEFAULT/nova_catalog_info')
77
-        is_expected.not_to contain_cinder_config('DEFAULT/os_privileged_user_name')
78
-        is_expected.not_to contain_cinder_config('DEFAULT/os_privileged_user_password')
79
-        is_expected.not_to contain_cinder_config('DEFAULT/os_privileged_user_tenant')
80
-        is_expected.not_to contain_cinder_config('DEFAULT/os_privileged_user_auth_url')
81
-
82
-      end
83
-    end
84
-
85 63
     context 'with a custom region for nova' do
86 64
       let :params do
87 65
         req_params.merge({'os_region_name' => 'MyRegion'})
@@ -293,17 +271,6 @@ describe 'cinder::api' do
293 271
       end
294 272
     end
295 273
 
296
-    context 'with barbican deprecated parameters' do
297
-      let :params do
298
-        req_params.merge!({
299
-          :keymgr_api_class           => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
300
-        })
301
-      end
302
-      it 'should set keymgr parameter' do
303
-        is_expected.to contain_cinder_config('key_manager/backend').with_value('castellan.key_manager.barbican_key_manager.BarbicanKeyManager')
304
-      end
305
-    end
306
-
307 274
   end
308 275
 
309 276
   on_supported_os({

+ 0
- 3
spec/classes/cinder_glance_spec.rb View File

@@ -22,7 +22,6 @@ require 'spec_helper'
22 22
 describe 'cinder::glance' do
23 23
   let :default_params do
24 24
     {
25
-      :glance_api_version         => '2',
26 25
       :glance_num_retries         => '<SERVICE DEFAULT>',
27 26
       :glance_api_insecure        => '<SERVICE DEFAULT>',
28 27
       :glance_api_ssl_compression => '<SERVICE DEFAULT>',
@@ -40,8 +39,6 @@ describe 'cinder::glance' do
40 39
     end
41 40
 
42 41
     it 'configures cinder.conf with default params' do
43
-      # glance_api_version is fully deprecated from cinder, and should not be added to the config.
44
-      is_expected.not_to contain_cinder_config('DEFAULT/glance_api_version')
45 42
       is_expected.to contain_cinder_config('DEFAULT/glance_num_retries').with_value(p[:glance_num_retries])
46 43
       is_expected.to contain_cinder_config('DEFAULT/glance_api_insecure').with_value(p[:glance_api_insecure])
47 44
       is_expected.to contain_cinder_config('DEFAULT/glance_api_ssl_compression').with_value(p[:glance_api_ssl_compression])

+ 0
- 127
spec/defines/cinder_backend_bdd_spec.rb View File

@@ -1,127 +0,0 @@
1
-require 'spec_helper'
2
-
3
-describe 'cinder::backend::bdd' do
4
-  let(:title) { 'hippo' }
5
-
6
-  let :params do
7
-    {
8
-      :target_ip_address => '127.0.0.2',
9
-      :available_devices => '/dev/sda',
10
-    }
11
-  end
12
-
13
-  shared_examples 'cinder block device' do
14
-    context 'with default parameters' do
15
-      it {
16
-        is_expected.to contain_cinder_config('hippo/volume_backend_name').with_value('hippo')
17
-        is_expected.to contain_cinder_config('hippo/volume_driver').with_value('cinder.volume.drivers.block_device.BlockDeviceDriver')
18
-        is_expected.to contain_cinder_config('hippo/available_devices').with_value('/dev/sda')
19
-        is_expected.to contain_cinder_config('hippo/target_helper').with_value('tgtadm')
20
-        is_expected.to contain_cinder_config('hippo/volumes_dir').with_value('/var/lib/cinder/volumes')
21
-        is_expected.to contain_cinder_config('hippo/target_ip_address').with_value('127.0.0.2')
22
-        is_expected.to contain_cinder_config('hippo/volume_group').with_value('<SERVICE DEFAULT>')
23
-        is_expected.to contain_cinder_config('hippo/target_protocol').with_value('<SERVICE DEFAULT>')
24
-        is_expected.to contain_cinder_config('hippo/volume_clear').with_value('<SERVICE DEFAULT>')
25
-        is_expected.to contain_cinder_config('hippo/backend_availability_zone').with_value('<SERVICE DEFAULT>')
26
-      }
27
-    end
28
-
29
-    context 'with optional parameters' do
30
-      before :each do
31
-        params.merge!({
32
-          :target_ip_address         => '10.20.0.2',
33
-          :available_devices         => '/dev/sdb,/dev/sdc',
34
-          :volumes_dir               => '/var/lib/cinder/bdd-volumes',
35
-          :volume_clear              => 'zero',
36
-          :volume_group              => 'cinder',
37
-          :target_helper             => 'lioadm',
38
-          :manage_volume_type        => true,
39
-          :backend_availability_zone => 'my_zone',
40
-        })
41
-      end
42
-
43
-      it {
44
-        is_expected.to contain_cinder_config('hippo/available_devices').with_value('/dev/sdb,/dev/sdc')
45
-        is_expected.to contain_cinder_config('hippo/volumes_dir').with_value('/var/lib/cinder/bdd-volumes')
46
-        is_expected.to contain_cinder_config('hippo/target_ip_address').with_value('10.20.0.2')
47
-        is_expected.to contain_cinder_config('hippo/target_helper').with_value('lioadm')
48
-        is_expected.to contain_cinder_config('hippo/volume_group').with_value('cinder')
49
-        is_expected.to contain_cinder_config('hippo/volume_clear').with_value('zero')
50
-        is_expected.to contain_cinder_config('hippo/backend_availability_zone').with_value('my_zone')
51
-      }
52
-
53
-      it { is_expected.to contain_cinder_type('hippo').with(
54
-        :ensure     => 'present',
55
-        :properties => ['volume_backend_name=hippo']
56
-      )}
57
-    end
58
-
59
-    context 'block device backend with additional configuration' do
60
-      before do
61
-        params.merge!( :extra_options => {'hippo/param1' => { 'value' => 'value1' }} )
62
-      end
63
-
64
-      it { is_expected.to contain_cinder_config('hippo/param1').with_value('value1') }
65
-    end
66
-
67
-    context 'with deprecated iscsi_ip_address' do
68
-      before do
69
-        params.merge!({
70
-          :target_ip_address => :undef,
71
-          :iscsi_ip_address  => '127.0.0.42',
72
-        })
73
-      end
74
-
75
-      it { is_expected.to contain_cinder_config('hippo/target_ip_address').with_value('127.0.0.42') }
76
-    end
77
-
78
-    context 'with no target_ip_address or iscsi_ip_address' do
79
-      before do
80
-        params.delete(:target_ip_address)
81
-      end
82
-
83
-      it { is_expected.to raise_error(Puppet::Error, /A target_ip_address or iscsi_ip_address must be specified./) }
84
-    end
85
-  end
86
-
87
-  shared_examples 'check needed daemons' do
88
-    context 'tgtadm helper' do
89
-      it {
90
-        is_expected.to contain_package('tgt').with_ensure('present')
91
-        is_expected.to contain_service('tgtd').with_ensure('running')
92
-      }
93
-    end
94
-
95
-    context 'lioadm helper' do
96
-     before do
97
-       params.merge!( :target_helper => 'lioadm' )
98
-     end
99
-
100
-     it {
101
-       is_expected.to contain_package('targetcli').with_ensure('present')
102
-       is_expected.to contain_service('target').with_ensure('running')
103
-     }
104
-    end
105
-
106
-    context 'wrong helper' do
107
-      before do
108
-        params.merge!( :target_helper => 'fake' )
109
-      end
110
-
111
-      it { is_expected.to raise_error(Puppet::Error, /Unsupported target helper: fake/) }
112
-    end
113
-  end
114
-
115
-  on_supported_os({
116
-    :supported_os => OSDefaults.get_supported_os
117
-  }).each do |os,facts|
118
-    context "on #{os}" do
119
-      let (:facts) do
120
-        facts.merge!(OSDefaults.get_facts())
121
-      end
122
-
123
-      it_behaves_like 'cinder block device'
124
-      it_behaves_like 'check needed daemons'
125
-    end
126
-  end
127
-end

+ 0
- 20
spec/defines/cinder_backend_dellsc_iscsi_spec.rb View File

@@ -40,7 +40,6 @@ describe 'cinder::backend::dellsc_iscsi' do
40 40
       :dell_sc_verify_cert       => true,
41 41
       :dell_sc_volume_folder     => 'other_vol',
42 42
       :target_port               => 222,
43
-      :excluded_domain_ip        => '127.0.0.2',
44 43
       :secondary_san_ip          => '127.0.0.3',
45 44
       :secondary_san_login       => 'Foo',
46 45
       :secondary_san_password    => 'Bar',
@@ -95,25 +94,6 @@ describe 'cinder::backend::dellsc_iscsi' do
95 94
 
96 95
       it { is_expected.to contain_cinder_type('dellsc_iscsi').with(:ensure => :present, :properties => ['volume_backend_name=dellsc_iscsi']) }
97 96
     end
98
-
99
-    context 'with deprecated iscsi_ip_address' do
100
-      before do
101
-        params.merge!({
102
-          :target_ip_address => :undef,
103
-          :iscsi_ip_address  => '127.0.0.42',
104
-        })
105
-      end
106
-
107
-      it { is_expected.to contain_cinder_config('dellsc_iscsi/target_ip_address').with_value('127.0.0.42') }
108
-    end
109
-
110
-    context 'with no target_ip_address or iscsi_ip_address' do
111
-      before do
112
-        params.delete(:target_ip_address)
113
-      end
114
-
115
-      it { is_expected.to raise_error(Puppet::Error, /A target_ip_address or iscsi_ip_address must be specified./) }
116
-    end
117 97
   end
118 98
 
119 99
   on_supported_os({

+ 0
- 19
spec/defines/cinder_backend_iscsi_spec.rb View File

@@ -76,25 +76,6 @@ describe 'cinder::backend::iscsi' do
76 76
         :value => 'value1',
77 77
       )}
78 78
     end
79
-
80
-    context 'with deprecated iscsi_ip_address' do
81
-      before :each do
82
-        params.merge!({
83
-          :target_ip_address => :undef,
84
-          :iscsi_ip_address  => '127.0.0.42',
85
-        })
86
-      end
87
-
88
-      it { is_expected.to contain_cinder_config('hippo/target_ip_address').with_value('127.0.0.42') }
89
-    end
90
-
91
-    context 'with no target_ip_address or iscsi_ip_address' do
92
-      before :each do
93
-        params.delete(:target_ip_address)
94
-      end
95
-
96
-      it { is_expected.to raise_error(Puppet::Error, /A target_ip_address or iscsi_ip_address must be specified./) }
97
-    end
98 79
   end
99 80
 
100 81
   shared_examples 'cinder::backend::iscsi on RedHat' do

Loading…
Cancel
Save