diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-20 00:18:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-20 00:18:44 +0000 |
| commit | fcafc264a573e7600c4dbe477f25f5caf7154f36 (patch) | |
| tree | 9ef5aa5f22efa34729c9e62144b6670b73e0f88e | |
| parent | f231f6a3d38b06630aaba11cec3bd32b4d1ca82c (diff) | |
| parent | 69be0c2ae7131af20385b4f11a8190ed9fba32c7 (diff) | |
Merge "Dell SC: Add secondary DSM support"
| -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 a6b7d5c7..a201134c 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 @@ -89,5 +101,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 |