Browse Source

Update netapp cinder configuration

The upstream puppet-cinder modules have been updated to remove
deprecated paramters. We were still passing in deprecated options for
the netapp volume. This change ports the backwards compatibility that
was being done in puppet-cinder into puppet-tripleo. This should be
dropped in a later cycle.

Change-Id: I08f548c7784f4e00add26aafc26a9671f503bb97
Closes-Bug: #1773188
tags/9.1.0
Alex Schultz 1 year ago
parent
commit
b2d7cab5f1

+ 34
- 22
manifests/profile/base/cinder/volume/netapp.pp View File

@@ -38,29 +38,41 @@ class tripleo::profile::base::cinder::volume::netapp (
38 38
       $cinder_netapp_nfs_shares = split(hiera('cinder::backend::netapp::nfs_shares', undef), ',')
39 39
     }
40 40
 
41
+    # fallback logic for search patterns since upstream puppet-cinder removed
42
+    # these.  See I286a593f0e68dc9e60852674d2fa14551acb1bbb from puppet-cinder
43
+    $list = join(any2array(delete(delete_undef_values([
44
+      hiera('cinder::backend::netapp::netapp_storage_pools', undef),
45
+      hiera('cinder::backend::netapp::netapp_volume_list', undef),
46
+    ]), '')),'|')
47
+    if $list != '' {
48
+      $netapp_pool_name_search_pattern_fallback = "(${list})"
49
+    } else {
50
+      $netapp_pool_name_search_pattern_fallback = undef
51
+    }
41 52
     cinder::backend::netapp { $backend_name :
42
-      netapp_login                 => hiera('cinder::backend::netapp::netapp_login', undef),
43
-      netapp_password              => hiera('cinder::backend::netapp::netapp_password', undef),
44
-      netapp_server_hostname       => hiera('cinder::backend::netapp::netapp_server_hostname', undef),
45
-      netapp_server_port           => hiera('cinder::backend::netapp::netapp_server_port', undef),
46
-      netapp_size_multiplier       => hiera('cinder::backend::netapp::netapp_size_multiplier', undef),
47
-      netapp_storage_family        => hiera('cinder::backend::netapp::netapp_storage_family', undef),
48
-      netapp_storage_protocol      => hiera('cinder::backend::netapp::netapp_storage_protocol', undef),
49
-      netapp_transport_type        => hiera('cinder::backend::netapp::netapp_transport_type', undef),
50
-      netapp_vfiler                => hiera('cinder::backend::netapp::netapp_vfiler', undef),
51
-      netapp_volume_list           => hiera('cinder::backend::netapp::netapp_volume_list', undef),
52
-      netapp_vserver               => hiera('cinder::backend::netapp::netapp_vserver', undef),
53
-      netapp_partner_backend_name  => hiera('cinder::backend::netapp::netapp_partner_backend_name', undef),
54
-      nfs_shares                   => $cinder_netapp_nfs_shares,
55
-      nfs_shares_config            => hiera('cinder::backend::netapp::nfs_shares_config', undef),
56
-      netapp_copyoffload_tool_path => hiera('cinder::backend::netapp::netapp_copyoffload_tool_path', undef),
57
-      netapp_controller_ips        => hiera('cinder::backend::netapp::netapp_controller_ips', undef),
58
-      netapp_sa_password           => hiera('cinder::backend::netapp::netapp_sa_password', undef),
59
-      netapp_storage_pools         => hiera('cinder::backend::netapp::netapp_storage_pools', undef),
60
-      netapp_eseries_host_type     => hiera('cinder::backend::netapp::netapp_eseries_host_type', undef),
61
-      netapp_webservice_path       => hiera('cinder::backend::netapp::netapp_webservice_path', undef),
62
-      nas_secure_file_operations   => hiera('cinder::backend::netapp::nas_secure_file_operations', undef),
63
-      nas_secure_file_permissions  => hiera('cinder::backend::netapp::nas_secure_file_permissions', undef),
53
+      netapp_login                    => hiera('cinder::backend::netapp::netapp_login', undef),
54
+      netapp_password                 => hiera('cinder::backend::netapp::netapp_password', undef),
55
+      netapp_server_hostname          => hiera('cinder::backend::netapp::netapp_server_hostname', undef),
56
+      netapp_server_port              => hiera('cinder::backend::netapp::netapp_server_port', undef),
57
+      netapp_size_multiplier          => hiera('cinder::backend::netapp::netapp_size_multiplier', undef),
58
+      netapp_storage_family           => hiera('cinder::backend::netapp::netapp_storage_family', undef),
59
+      netapp_storage_protocol         => hiera('cinder::backend::netapp::netapp_storage_protocol', undef),
60
+      netapp_transport_type           => hiera('cinder::backend::netapp::netapp_transport_type', undef),
61
+      netapp_vfiler                   => hiera('cinder::backend::netapp::netapp_vfiler', undef),
62
+      netapp_vserver                  => hiera('cinder::backend::netapp::netapp_vserver', undef),
63
+      netapp_partner_backend_name     => hiera('cinder::backend::netapp::netapp_partner_backend_name', undef),
64
+      nfs_shares                      => $cinder_netapp_nfs_shares,
65
+      nfs_shares_config               => hiera('cinder::backend::netapp::nfs_shares_config', undef),
66
+      netapp_copyoffload_tool_path    => hiera('cinder::backend::netapp::netapp_copyoffload_tool_path', undef),
67
+      netapp_controller_ips           => hiera('cinder::backend::netapp::netapp_controller_ips', undef),
68
+      netapp_sa_password              => hiera('cinder::backend::netapp::netapp_sa_password', undef),
69
+      netapp_host_type                => hiera('cinder::backend::netapp::netapp_host_type',
70
+                                                hiera('cinder::backend::netapp::netapp_eseries_host_type', undef)),
71
+      netapp_webservice_path          => hiera('cinder::backend::netapp::netapp_webservice_path', undef),
72
+      nas_secure_file_operations      => hiera('cinder::backend::netapp::nas_secure_file_operations', undef),
73
+      nas_secure_file_permissions     => hiera('cinder::backend::netapp::nas_secure_file_permissions', undef),
74
+      netapp_pool_name_search_pattern => hiera('cinder::backend::netapp::netapp_pool_name_search_pattern',
75
+                                                $netapp_pool_name_search_pattern_fallback),
64 76
     }
65 77
   }
66 78
 

+ 9
- 0
releasenotes/notes/cinder-netapp-hieradata-changes-3004544d96796e76.yaml View File

@@ -0,0 +1,9 @@
1
+---
2
+upgrade:
3
+  - |
4
+    The following hieradata updates for cinder netapp integration should be done.
5
+    cinder::backend::netapp::netapp_pool_name_search_pattern should be used as
6
+    cinder::backend::netapp::netapp_storage_pools and
7
+    cinder::backend::netapp::netapp_volume_list have been removed.
8
+    cinder::backend::netapp::netapp_host_type should be configured instead of
9
+    cinder::backend::netapp::netapp_eseries_host_type

Loading…
Cancel
Save