summaryrefslogtreecommitdiff
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
parent628d7a7901bae6e1549d16e9203392da4fb117b2 (diff)
parent92bc869a2b47a78a11f2b55e9d89c7f8fb5b9d71 (diff)
Merge "Dell SC: Add secondary DSM support" into stable/ocata
-rw-r--r--environments/cinder-dellsc-config.yaml10
-rw-r--r--puppet/services/cinder-backend-dellsc.yaml16
2 files changed, 23 insertions, 3 deletions
diff --git a/environments/cinder-dellsc-config.yaml b/environments/cinder-dellsc-config.yaml
index 617d640..99e517b 100644
--- a/environments/cinder-dellsc-config.yaml
+++ b/environments/cinder-dellsc-config.yaml
@@ -9,9 +9,13 @@ parameter_defaults:
9 CinderDellScSanIp: '' 9 CinderDellScSanIp: ''
10 CinderDellScSanLogin: 'Admin' 10 CinderDellScSanLogin: 'Admin'
11 CinderDellScSanPassword: '' 11 CinderDellScSanPassword: ''
12 CinderDellScSsn: '64702' 12 CinderDellScSsn: 64702
13 CinderDellScIscsiIpAddress: '' 13 CinderDellScIscsiIpAddress: ''
14 CinderDellScIscsiPort: '3260' 14 CinderDellScIscsiPort: 3260
15 CinderDellScApiPort: '3033' 15 CinderDellScApiPort: 3033
16 CinderDellScServerFolder: 'dellsc_server' 16 CinderDellScServerFolder: 'dellsc_server'
17 CinderDellScVolumeFolder: 'dellsc_volume' 17 CinderDellScVolumeFolder: 'dellsc_volume'
18 CinderDellScSecondarySanIp: ''
19 CinderDellScSecondarySanLogin: 'Admin'
20 CinderDellScSecondarySanPassword: ''
21 CinderDellScSecondaryScApiPort: 3033
diff --git a/puppet/services/cinder-backend-dellsc.yaml b/puppet/services/cinder-backend-dellsc.yaml
index 6a6196a..cd20725 100644
--- a/puppet/services/cinder-backend-dellsc.yaml
+++ b/puppet/services/cinder-backend-dellsc.yaml
@@ -49,6 +49,18 @@ parameters:
49 CinderDellScVolumeFolder: 49 CinderDellScVolumeFolder:
50 type: string 50 type: string
51 default: 'dellsc_volume' 51 default: 'dellsc_volume'
52 CinderDellScSecondarySanIp:
53 type: string
54 default: ''
55 CinderDellScSecondarySanLogin:
56 type: string
57 default: 'Admin'
58 CinderDellScSecondarySanPassword:
59 type: string
60 hidden: true
61 CinderDellScSecondaryScApiPort:
62 type: number
63 default: 3033
52 ServiceNetMap: 64 ServiceNetMap:
53 default: {} 65 default: {}
54 description: Mapping of service_name -> network name. Typically set 66 description: Mapping of service_name -> network name. Typically set
@@ -81,5 +93,9 @@ outputs:
81 cinder::backend::dellsc_iscsi::dell_sc_api_port: {get_param: CinderDellScApiPort} 93 cinder::backend::dellsc_iscsi::dell_sc_api_port: {get_param: CinderDellScApiPort}
82 cinder::backend::dellsc_iscsi::dell_sc_server_folder: {get_param: CinderDellScServerFolder} 94 cinder::backend::dellsc_iscsi::dell_sc_server_folder: {get_param: CinderDellScServerFolder}
83 cinder::backend::dellsc_iscsi::dell_sc_volume_folder: {get_param: CinderDellScVolumeFolder} 95 cinder::backend::dellsc_iscsi::dell_sc_volume_folder: {get_param: CinderDellScVolumeFolder}
96 cinder::backend::dellsc_iscsi::secondary_san_ip: {get_param: CinderDellScSecondarySanIp}
97 cinder::backend::dellsc_iscsi::secondary_san_login: {get_param: CinderDellScSecondarySanLogin}
98 cinder::backend::dellsc_iscsi::secondary_san_password: {get_param: CinderDellScSecondarySanPassword}
99 cinder::backend::dellsc_iscsi::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort}
84 step_config: | 100 step_config: |
85 include ::tripleo::profile::base::cinder::volume 101 include ::tripleo::profile::base::cinder::volume