diff options
| author |   rajinir <rajini_ram@dell.com> | 2017-04-10 13:32:06 -0500 |
|---|---|---|
| committer | rajinir <rajini_ram@dell.com> | 2017-04-24 14:49:01 -0500 |
| commit | 69be0c2ae7131af20385b4f11a8190ed9fba32c7 (patch) | |
| tree | a82a5ae9f8248d9b1b1459d6cd577f6417c2cb9b | |
| parent | 8bcd1ed1109c631219638bc40b856940b8017e42 (diff) | |
Dell SC: Add secondary DSM support
Adds support for a secondary DSM in case the primary becomes
unavailable.
Change-Id: I0887e15a7e1c90a4f333bef6cdbb5d43ba0cd838
Closes-Bug: #1681492
Depends-On: I331466e4f254b2b8ff7891b796e78cd30c2c87f7
| -rw-r--r-- | environments/cinder-dellsc-config.yaml | 10 | ||||
| -rw-r--r-- | puppet/services/cinder-backend-dellsc.yaml | 16 |
2 files changed, 23 insertions, 3 deletions
diff --git a/environments/cinder-dellsc-config.yaml b/environments/cinder-dellsc-config.yaml index 617d640c..99e517bf 100644 --- a/environments/cinder-dellsc-config.yaml +++ b/environments/cinder-dellsc-config.yaml @@ -9,9 +9,13 @@ parameter_defaults: CinderDellScSanIp: '' CinderDellScSanLogin: 'Admin' CinderDellScSanPassword: '' - CinderDellScSsn: '64702' + CinderDellScSsn: 64702 CinderDellScIscsiIpAddress: '' - CinderDellScIscsiPort: '3260' - CinderDellScApiPort: '3033' + CinderDellScIscsiPort: 3260 + CinderDellScApiPort: 3033 CinderDellScServerFolder: 'dellsc_server' CinderDellScVolumeFolder: 'dellsc_volume' + CinderDellScSecondarySanIp: '' + CinderDellScSecondarySanLogin: 'Admin' + CinderDellScSecondarySanPassword: '' + CinderDellScSecondaryScApiPort: 3033 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 |