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
tags/15.0.0.0rc1^0
yatinkarel 5 months ago
parent
commit
000b695f9e
7 changed files with 26 additions and 29 deletions
  1. +4
    -4
      packstack/puppet/modules/packstack/manifests/cinder/backend/gluster.pp
  2. +7
    -7
      packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp
  3. +4
    -4
      packstack/puppet/modules/packstack/manifests/cinder/backend/netapp.pp
  4. +3
    -3
      packstack/puppet/modules/packstack/manifests/cinder/backend/nfs.pp
  5. +4
    -4
      packstack/puppet/modules/packstack/manifests/cinder/backend/solidfire.pp
  6. +4
    -4
      packstack/puppet/modules/packstack/manifests/cinder/backend/vmdk.pp
  7. +0
    -3
      packstack/puppet/modules/packstack/manifests/keystone/cinder.pp

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

@@ -8,9 +8,9 @@ class packstack::cinder::backend::gluster ()
glusterfs_shares_config => '/etc/cinder/glusterfs_shares.conf',
}

cinder::type { 'glusterfs':
set_key => 'volume_backend_name',
set_value => 'gluster',
require => Class['cinder::api'],
cinder_type { 'glusterfs':
ensure => present,
properties => ["volume_backend_name=gluster"],
require => Class['cinder::api'],
}
}

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

@@ -85,14 +85,14 @@ class packstack::cinder::backend::lvm ()
}

cinder::backend::iscsi { 'lvm':
iscsi_ip_address => hiera('CONFIG_STORAGE_HOST_URL'),
require => Package['lvm2'],
volume_group => $cinder_volume_name,
target_ip_address => hiera('CONFIG_STORAGE_HOST_URL'),
require => Package['lvm2'],
volume_group => $cinder_volume_name,
}

cinder::type { 'iscsi':
set_key => 'volume_backend_name',
set_value => 'lvm',
require => Class['cinder::api'],
cinder_type { 'iscsi':
ensure => present,
properties => ["volume_backend_name=lvm"],
require => Class['cinder::api'],
}
}

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

@@ -125,9 +125,9 @@ class packstack::cinder::backend::netapp ()
ensure_packages(['iscsi-initiator-utils'], {'ensure' => 'present'})
}

cinder::type { $netapp_backend_name:
set_key => 'volume_backend_name',
set_value => $netapp_backend_name,
require => Class['cinder::api'],
cinder_type { $netapp_backend_name:
ensure => present,
properties => ["volume_backend_name=${netapp_backend_name}"],
require => Class['cinder::api'],
}
}

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

@@ -8,9 +8,9 @@ class packstack::cinder::backend::nfs ()
nfs_shares_config => '/etc/cinder/nfs_shares.conf',
}

cinder::type { 'nfs':
set_key => 'volume_backend_name',
set_value => 'nfs',
cinder_type { 'nfs':
ensure => present,
properties => ["volume_backend_name=nfs"],
require => Class['cinder::api'],
}
}

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

@@ -12,9 +12,9 @@ class packstack::cinder::backend::solidfire ()

ensure_packages(['iscsi-initiator-utils'], {'ensure' => 'present'})

cinder::type { $solidfire_backend_name:
set_key => 'volume_backend_name',
set_value => $solidfire_backend_name,
require => Class['cinder::api'],
cinder_type { $solidfire_backend_name:
ensure => present,
properties => ["volume_backend_name=${solidfire_backend_name}"],
require => Class['cinder::api'],
}
}

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

@@ -6,9 +6,9 @@ class packstack::cinder::backend::vmdk ()
host_password => hiera('CONFIG_VCENTER_PASSWORD'),
}

cinder::type { 'vmdk':
set_key => 'volume_backend_name',
set_value => 'vmdk',
require => Class['cinder::api'],
cinder_type { 'vmdk':
ensure => present,
properties => ["volume_backend_name=vmdk"],
require => Class['cinder::api'],
}
}

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

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

Loading…
Cancel
Save