openstack
/
puppet-tripleo
Code Issues Proposed changes

Dell EMC SC: Add support for excluded_domain_ips 

The Dell EMC SC configuration option excluded_domain_ip has been
deprecated and will be removed in a future release. Deployments
should now migrate to the option excluded_domain_ips for
equivalent functionality.

Depends-On: https://review.openstack.org/#/c/604384/
Change-Id: Ib9218e7825fef83e41bdebaba3a444935c8a38e1
This commit is contained in:
rajinir 2018-09-21 12:57:40 -05:00
parent 7edd77522a
commit 7fd1113baf
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/profile/base/cinder/volume/dellsc.pp
View File

@ -33,7 +33,16 @@ class tripleo::profile::base::cinder::volume::dellsc (
) {
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {
$excluded_domain_ip = hiera('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef)
if $excluded_domain_ip == '' {
$excluded_domain_ip_real = undef
} else {
$excluded_domain_ip_real = $excluded_domain_ip
}
cinder::backend::dellsc_iscsi { $backend_name :
san_ip => hiera('cinder::backend::dellsc_iscsi::san_ip', undef),
san_login => hiera('cinder::backend::dellsc_iscsi::san_login', undef),
@ -44,7 +53,8 @@ class tripleo::profile::base::cinder::volume::dellsc (
dell_sc_api_port => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
dell_sc_server_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
dell_sc_volume_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
excluded_domain_ip => hiera('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef),
excluded_domain_ip => $excluded_domain_ip_real,
excluded_domain_ips => hiera('cinder::backend::dellsc_iscsi::excluded_domain_ips', undef),
secondary_san_ip => hiera('cinder::backend::dellsc_iscsi::secondary_san_ip', undef),
secondary_san_login => hiera('cinder::backend::dellsc_iscsi::secondary_san_login', undef),
secondary_san_password => hiera('cinder::backend::dellsc_iscsi::secondary_san_password', undef),

6
releasenotes/notes/cinder-dellsc-excluded-domain_ips-1004544d96796e76.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The following hieradata updates for cinder dell sc to be done.
cinder::backend::dellsc::excluded_domain_ip to be deprecated, use
comma separated cinder::backend::netapp::excluded_domain_ips instead.