Dell SC: Add secondary DSM support

Adds support for a secondary DSM in case the primary becomes
unavailable.

Change-Id: Ibf8c333f62556d421d67c853f1f0740d7f9985bf
Depends-On: I331466e4f254b2b8ff7891b796e78cd30c2c87f7
(cherry picked from commit f30b791103ec3c5ff9b2e656fe751ad4bb3c6a6c)

diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp
index ab6bbeb..a60eadf 100644 (file)
--- a/manifests/profile/base/cinder/volume/dellsc.pp
+++ b/manifests/profile/base/cinder/volume/dellsc.pp
@@ -35,16 +35,20 @@ class tripleo::profile::base::cinder::volume::dellsc (
 
   if $step >= 4 {
     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),
-      san_password          => hiera('cinder::backend::dellsc_iscsi::san_password', undef),
-      dell_sc_ssn           => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef),
-      iscsi_ip_address      => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
-      iscsi_port            => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
-      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),
+      san_ip                 => hiera('cinder::backend::dellsc_iscsi::san_ip', undef),
+      san_login              => hiera('cinder::backend::dellsc_iscsi::san_login', undef),
+      san_password           => hiera('cinder::backend::dellsc_iscsi::san_password', undef),
+      dell_sc_ssn            => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef),
+      iscsi_ip_address       => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
+      iscsi_port             => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
+      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),
+      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),
+      secondary_sc_api_port  => hiera('cinder::backend::dellsc_iscsi::secondary_sc_api_port', undef),
     }
   }