Browse Source

Remove usage of deprecated cinder parameters

https://review.opendev.org/#/c/678965 removed
some deprecated parameters for puppet-cinder,
this patch cleans there usage in packstack, also
replace deprecated cinder::type usage with
cinder_type resource.

Change-Id: I8f1f3f39b7f4648ac2cb6ed8caceb48d9dba0ad0
changes/78/681378/1
yatinkarel 1 week ago
parent
commit
000b695f9e

+ 4
- 4
packstack/puppet/modules/packstack/manifests/cinder/backend/gluster.pp View File

@@ -8,9 +8,9 @@ class packstack::cinder::backend::gluster ()
8 8
       glusterfs_shares_config => '/etc/cinder/glusterfs_shares.conf',
9 9
     }
10 10
 
11
-    cinder::type { 'glusterfs':
12
-      set_key   => 'volume_backend_name',
13
-      set_value => 'gluster',
14
-      require   => Class['cinder::api'],
11
+    cinder_type { 'glusterfs':
12
+      ensure     => present,
13
+      properties => ["volume_backend_name=gluster"],
14
+      require    => Class['cinder::api'],
15 15
     }
16 16
 }

+ 7
- 7
packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp View File

@@ -85,14 +85,14 @@ class packstack::cinder::backend::lvm ()
85 85
     }
86 86
 
87 87
     cinder::backend::iscsi { 'lvm':
88
-      iscsi_ip_address => hiera('CONFIG_STORAGE_HOST_URL'),
89
-      require          => Package['lvm2'],
90
-      volume_group     => $cinder_volume_name,
88
+      target_ip_address => hiera('CONFIG_STORAGE_HOST_URL'),
89
+      require           => Package['lvm2'],
90
+      volume_group      => $cinder_volume_name,
91 91
     }
92 92
 
93
-    cinder::type { 'iscsi':
94
-      set_key   => 'volume_backend_name',
95
-      set_value => 'lvm',
96
-      require   => Class['cinder::api'],
93
+    cinder_type { 'iscsi':
94
+      ensure     => present,
95
+      properties => ["volume_backend_name=lvm"],
96
+      require    => Class['cinder::api'],
97 97
     }
98 98
 }

+ 4
- 4
packstack/puppet/modules/packstack/manifests/cinder/backend/netapp.pp View File

@@ -125,9 +125,9 @@ class packstack::cinder::backend::netapp ()
125 125
         ensure_packages(['iscsi-initiator-utils'], {'ensure' => 'present'})
126 126
     }
127 127
 
128
-    cinder::type { $netapp_backend_name:
129
-      set_key   => 'volume_backend_name',
130
-      set_value => $netapp_backend_name,
131
-      require   => Class['cinder::api'],
128
+    cinder_type { $netapp_backend_name:
129
+      ensure     => present,
130
+      properties => ["volume_backend_name=${netapp_backend_name}"],
131
+      require    => Class['cinder::api'],
132 132
     }
133 133
 }

+ 3
- 3
packstack/puppet/modules/packstack/manifests/cinder/backend/nfs.pp View File

@@ -8,9 +8,9 @@ class packstack::cinder::backend::nfs ()
8 8
       nfs_shares_config => '/etc/cinder/nfs_shares.conf',
9 9
     }
10 10
 
11
-    cinder::type { 'nfs':
12
-      set_key   => 'volume_backend_name',
13
-      set_value => 'nfs',
11
+    cinder_type { 'nfs':
12
+      ensure     => present,
13
+      properties => ["volume_backend_name=nfs"],
14 14
       require   => Class['cinder::api'],
15 15
     }
16 16
 }

+ 4
- 4
packstack/puppet/modules/packstack/manifests/cinder/backend/solidfire.pp View File

@@ -12,9 +12,9 @@ class packstack::cinder::backend::solidfire ()
12 12
 
13 13
     ensure_packages(['iscsi-initiator-utils'], {'ensure' => 'present'})
14 14
 
15
-    cinder::type { $solidfire_backend_name:
16
-      set_key   => 'volume_backend_name',
17
-      set_value => $solidfire_backend_name,
18
-      require   => Class['cinder::api'],
15
+    cinder_type { $solidfire_backend_name:
16
+      ensure     => present,
17
+      properties => ["volume_backend_name=${solidfire_backend_name}"],
18
+      require    => Class['cinder::api'],
19 19
     }
20 20
 }

+ 4
- 4
packstack/puppet/modules/packstack/manifests/cinder/backend/vmdk.pp View File

@@ -6,9 +6,9 @@ class packstack::cinder::backend::vmdk ()
6 6
       host_password => hiera('CONFIG_VCENTER_PASSWORD'),
7 7
     }
8 8
 
9
-    cinder::type { 'vmdk':
10
-      set_key   => 'volume_backend_name',
11
-      set_value => 'vmdk',
12
-      require   => Class['cinder::api'],
9
+    cinder_type { 'vmdk':
10
+      ensure     => present,
11
+      properties => ["volume_backend_name=vmdk"],
12
+      require    => Class['cinder::api'],
13 13
     }
14 14
 }

+ 0
- 3
packstack/puppet/modules/packstack/manifests/keystone/cinder.pp View File

@@ -8,9 +8,6 @@ class packstack::keystone::cinder ()
8 8
     class { '::cinder::keystone::auth':
9 9
       region          => hiera('CONFIG_KEYSTONE_REGION'),
10 10
       password        => hiera('CONFIG_CINDER_KS_PW'),
11
-      public_url      => "${cinder_url}/v1/%(tenant_id)s",
12
-      internal_url    => "${cinder_url}/v1/%(tenant_id)s",
13
-      admin_url       => "${cinder_url}/v1/%(tenant_id)s",
14 11
       public_url_v2   => "${cinder_url}/v2/%(tenant_id)s",
15 12
       internal_url_v2 => "${cinder_url}/v2/%(tenant_id)s",
16 13
       admin_url_v2    => "${cinder_url}/v2/%(tenant_id)s",

Loading…
Cancel
Save