openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Fixing incorrect parameter names in Dell EMC Storage Templates" into stable/ussuri

This commit is contained in:
Zuul 2020-11-15 03:45:38 +00:00 committed by Gerrit Code Review
parent aad82a1318 78ebc47345
commit 338ad2420a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/cinder/volume/dellemc_powermax.pp
View File

@ -44,7 +44,7 @@ class tripleo::profile::base::cinder::volume::dellemc_powermax (
'CinderPowermaxAvailabilityZone' => hiera('cinder::backend::dellemc_powermax::backend_availability_zone', undef),
'CinderPowermaxSanIp' => hiera('cinder::backend::dellemc_powermax::san_ip', undef),
'CinderPowermaxSanLogin' => hiera('cinder::backend::dellemc_powermax::san_login', undef),
'CinderPowermaxSanPassword' => hiera('cinder::backend::dellemc_powermax::san password', undef),
'CinderPowermaxSanPassword' => hiera('cinder::backend::dellemc_powermax::san_password', undef),
'CinderPowermaxStorageProtocol' => hiera('cinder::backend::dellemc_powermax::powermax_storage_protocol', undef),
'CinderPowermaxArray' => hiera('cinder::backend::dellemc_powermax::powermax_array', undef),
'CinderPowermaxSrp' => hiera('cinder::backend::dellemc_powermax::powermax_srp', undef),

2
manifests/profile/base/cinder/volume/dellemc_sc.pp
View File

@ -44,7 +44,7 @@ class tripleo::profile::base::cinder::volume::dellemc_sc (
'CinderSCAvailabilityZone' => hiera('cinder::backend::dellemc_sc::backend_availability_zone', undef),
'CinderSCSanIp' => hiera('cinder::backend::dellemc_sc::san_ip', undef),
'CinderSCSanLogin' => hiera('cinder::backend::dellemc_sc::san_login', undef),
'CinderSCSanPassword' => hiera('cinder::backend::dellemc_sc::san password', undef),
'CinderSCSanPassword' => hiera('cinder::backend::dellemc_sc::san_password', undef),
'CinderSCStorageProtocol' => hiera('cinder::backend::dellemc_sc::sc_storage_protocol', undef),
'CinderSCSSN' => hiera('cinder::backend::dellemc_sc::dell_sc_ssn', undef),
'CinderSCTargetIpAddress' => hiera('cinder::backend::dellemc_sc::iscsi_ip_address', undef),

4
manifests/profile/base/cinder/volume/dellemc_xtremio.pp
View File

@ -44,7 +44,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio (
'CinderXtremioAvailabilityZone' => hiera('cinder::backend::dellemc_xtremio::backend_availability_zone', undef),
'CinderXtremioSanIp' => hiera('cinder::backend::dellemc_xtremio::san_ip', undef),
'CinderXtremioSanLogin' => hiera('cinder::backend::dellemc_xtremio::san_login', undef),
'CinderXtremioSanPassword' => hiera('cinder::backend::dellemc_xtremio::san password', undef),
'CinderXtremioSanPassword' => hiera('cinder::backend::dellemc_xtremio::san_password', undef),
'CinderXtremioStorageProtocol' => hiera('cinder::backend::dellemc_xtremio::xtremio_storage_protocol', undef),
'CinderXtremioClusterName' => hiera('cinder::backend::dellemc_xtremio::xtremio_cluster_name', undef),
'CinderXtremioArrayBusyRetryCount' => hiera('cinder::backend::dellemc_xtremio::xtremio_array_busy_retry_count', undef),
@ -61,7 +61,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio (
san_login => $backend_config['CinderXtremioSanLogin'],
san_password => $backend_config['CinderXtremioSanPassword'],
xtremio_storage_protocol => $backend_config['CinderXtremioStorageProtocol'],
xtremio_cluster_name => $backend_config['CinderXtremioSSN'],
xtremio_cluster_name => $backend_config['CinderXtremioClusterName'],
xtremio_array_busy_retry_count => $backend_config['CinderXtremioArrayBusyRetryCount'],
xtremio_array_busy_retry_interval => $backend_config['CinderXtremioArrayBusyRetryInterval'],
xtremio_volumes_per_glance_cache => $backend_config['CinderXtremioVolumesPerGlanceCache'],