aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-14 15:04:14 +0000
committerGerrit Code Review <review@openstack.org>2017-06-14 15:04:14 +0000
commit61d2dfc01f022774b5967e3da67f368759f51a78 (patch)
tree254825b9f2f11781b1e6c5e6cf60152a8d961488 /puppet/services
parent628d7a7901bae6e1549d16e9203392da4fb117b2 (diff)
parent92bc869a2b47a78a11f2b55e9d89c7f8fb5b9d71 (diff)
Merge "Dell SC: Add secondary DSM support" into stable/ocata
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/cinder-backend-dellsc.yaml16
1 files changed, 16 insertions, 0 deletions
diff --git a/puppet/services/cinder-backend-dellsc.yaml b/puppet/services/cinder-backend-dellsc.yaml
index 6a6196ac..cd207257 100644
--- a/puppet/services/cinder-backend-dellsc.yaml
+++ b/puppet/services/cinder-backend-dellsc.yaml
@@ -49,6 +49,18 @@ parameters:
CinderDellScVolumeFolder:
type: string
default: 'dellsc_volume'
+ CinderDellScSecondarySanIp:
+ type: string
+ default: ''
+ CinderDellScSecondarySanLogin:
+ type: string
+ default: 'Admin'
+ CinderDellScSecondarySanPassword:
+ type: string
+ hidden: true
+ CinderDellScSecondaryScApiPort:
+ type: number
+ default: 3033
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@ -81,5 +93,9 @@ outputs:
cinder::backend::dellsc_iscsi::dell_sc_api_port: {get_param: CinderDellScApiPort}
cinder::backend::dellsc_iscsi::dell_sc_server_folder: {get_param: CinderDellScServerFolder}
cinder::backend::dellsc_iscsi::dell_sc_volume_folder: {get_param: CinderDellScVolumeFolder}
+ cinder::backend::dellsc_iscsi::secondary_san_ip: {get_param: CinderDellScSecondarySanIp}
+ cinder::backend::dellsc_iscsi::secondary_san_login: {get_param: CinderDellScSecondarySanLogin}
+ cinder::backend::dellsc_iscsi::secondary_san_password: {get_param: CinderDellScSecondarySanPassword}
+ cinder::backend::dellsc_iscsi::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort}
step_config: |
include ::tripleo::profile::base::cinder::volume