summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 22:56:35 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 22:56:35 +0000
commitdfe30e0c786fa7c16eda3be2c54f3fefc551e8c4 (patch)
treeecc94b90fb434f6ae1ed3834d3ff0bb15a1f1b82
parentee5366fc5e71d047c1b91af4522a46c6acbef589 (diff)
parentff58a86171dbf374f7ccf4376cb6908209a8b8a3 (diff)
Merge "Dell SC: Add secondary DSM support" into stable/ocata
-rw-r--r--manifests/profile/base/cinder/volume/dellsc.pp24
1 files changed, 14 insertions, 10 deletions
diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp
index ab6bbeb..a60eadf 100644
--- 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 (
35 35
36 if $step >= 4 { 36 if $step >= 4 {
37 cinder::backend::dellsc_iscsi { $backend_name : 37 cinder::backend::dellsc_iscsi { $backend_name :
38 san_ip => hiera('cinder::backend::dellsc_iscsi::san_ip', undef), 38 san_ip => hiera('cinder::backend::dellsc_iscsi::san_ip', undef),
39 san_login => hiera('cinder::backend::dellsc_iscsi::san_login', undef), 39 san_login => hiera('cinder::backend::dellsc_iscsi::san_login', undef),
40 san_password => hiera('cinder::backend::dellsc_iscsi::san_password', undef), 40 san_password => hiera('cinder::backend::dellsc_iscsi::san_password', undef),
41 dell_sc_ssn => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef), 41 dell_sc_ssn => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef),
42 iscsi_ip_address => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef), 42 iscsi_ip_address => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
43 iscsi_port => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef), 43 iscsi_port => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
44 dell_sc_api_port => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef), 44 dell_sc_api_port => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
45 dell_sc_server_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef), 45 dell_sc_server_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
46 dell_sc_volume_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef), 46 dell_sc_volume_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
47 excluded_domain_ip => hiera('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef), 47 excluded_domain_ip => hiera('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef),
48 secondary_san_ip => hiera('cinder::backend::dellsc_iscsi::secondary_san_ip', undef),
49 secondary_san_login => hiera('cinder::backend::dellsc_iscsi::secondary_san_login', undef),
50 secondary_san_password => hiera('cinder::backend::dellsc_iscsi::secondary_san_password', undef),
51 secondary_sc_api_port => hiera('cinder::backend::dellsc_iscsi::secondary_sc_api_port', undef),
48 } 52 }
49 } 53 }
50 54