diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-14 15:04:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-14 15:04:14 +0000 |
| commit | 61d2dfc01f022774b5967e3da67f368759f51a78 (patch) | |
| tree | 254825b9f2f11781b1e6c5e6cf60152a8d961488 | |
| parent | 628d7a7901bae6e1549d16e9203392da4fb117b2 (diff) | |
| parent | 92bc869a2b47a78a11f2b55e9d89c7f8fb5b9d71 (diff) | |
Merge "Dell SC: Add secondary DSM support" into stable/ocata
| -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 |