openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Dell SC: Add secondary DSM support"

Browse Source
This commit is contained in:
Jenkins 2017-05-20 00:18:44 +00:00 committed by Gerrit Code Review
commit fcafc264a5
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
environments/cinder-dellsc-config.yaml
View File

@ -9,9 +9,13 @@ parameter_defaults:
CinderDellScSanIp: '' CinderDellScSanIp: ''
CinderDellScSanLogin: 'Admin' CinderDellScSanLogin: 'Admin'
CinderDellScSanPassword: '' CinderDellScSanPassword: ''
CinderDellScSsn: '64702' CinderDellScSsn: 64702
CinderDellScIscsiIpAddress: '' CinderDellScIscsiIpAddress: ''
CinderDellScIscsiPort: '3260' CinderDellScIscsiPort: 3260
CinderDellScApiPort: '3033' CinderDellScApiPort: 3033
CinderDellScServerFolder: 'dellsc_server' CinderDellScServerFolder: 'dellsc_server'
CinderDellScVolumeFolder: 'dellsc_volume' CinderDellScVolumeFolder: 'dellsc_volume'
CinderDellScSecondarySanIp: ''
CinderDellScSecondarySanLogin: 'Admin'
CinderDellScSecondarySanPassword: ''
CinderDellScSecondaryScApiPort: 3033

16
puppet/services/cinder-backend-dellsc.yaml
View File

@ -49,6 +49,18 @@ parameters:
CinderDellScVolumeFolder: CinderDellScVolumeFolder:
type: string type: string
default: 'dellsc_volume' default: 'dellsc_volume'
CinderDellScSecondarySanIp:
type: string
default: ''
CinderDellScSecondarySanLogin:
type: string
default: 'Admin'
CinderDellScSecondarySanPassword:
type: string
hidden: true
CinderDellScSecondaryScApiPort:
type: number
default: 3033
ServiceNetMap: ServiceNetMap:
default: {} default: {}
description: Mapping of service_name -> network name. Typically set description: Mapping of service_name -> network name. Typically set
@ -89,5 +101,9 @@ outputs:
cinder::backend::dellsc_iscsi::dell_sc_api_port: {get_param: CinderDellScApiPort} 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_server_folder: {get_param: CinderDellScServerFolder}
cinder::backend::dellsc_iscsi::dell_sc_volume_folder: {get_param: CinderDellScVolumeFolder} 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: | step_config: |
include ::tripleo::profile::base::cinder::volume include ::tripleo::profile::base::cinder::volume