summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 16:33:14 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 16:33:14 +0000
commitc20e85a3b31c537c98ea3f178f4840744f82d7d4 (patch)
tree6a61eea9f8aacf9f24508668718fc672b91a4d1f
parent8be72939201a9b38193d01dae7d059840df16470 (diff)
parent3f053a91db788259360760a4d8e3b6f85dbb8475 (diff)
Merge "Dell SC: Add exclude_domain_ip option" into stable/ocata
-rw-r--r--environments/cinder-dellsc-config.yaml1
-rw-r--r--puppet/services/cinder-backend-dellsc.yaml4
2 files changed, 5 insertions, 0 deletions
diff --git a/environments/cinder-dellsc-config.yaml b/environments/cinder-dellsc-config.yaml
index 99e517b..681a2fe 100644
--- a/environments/cinder-dellsc-config.yaml
+++ b/environments/cinder-dellsc-config.yaml
@@ -19,3 +19,4 @@ parameter_defaults:
19 CinderDellScSecondarySanLogin: 'Admin' 19 CinderDellScSecondarySanLogin: 'Admin'
20 CinderDellScSecondarySanPassword: '' 20 CinderDellScSecondarySanPassword: ''
21 CinderDellScSecondaryScApiPort: 3033 21 CinderDellScSecondaryScApiPort: 3033
22 CinderDellScExcludedDomainIp: ''
diff --git a/puppet/services/cinder-backend-dellsc.yaml b/puppet/services/cinder-backend-dellsc.yaml
index cd20725..8360a34 100644
--- a/puppet/services/cinder-backend-dellsc.yaml
+++ b/puppet/services/cinder-backend-dellsc.yaml
@@ -61,6 +61,9 @@ parameters:
61 CinderDellScSecondaryScApiPort: 61 CinderDellScSecondaryScApiPort:
62 type: number 62 type: number
63 default: 3033 63 default: 3033
64 CinderDellScExcludedDomainIp:
65 type: string
66 default: ''
64 ServiceNetMap: 67 ServiceNetMap:
65 default: {} 68 default: {}
66 description: Mapping of service_name -> network name. Typically set 69 description: Mapping of service_name -> network name. Typically set
@@ -97,5 +100,6 @@ outputs:
97 cinder::backend::dellsc_iscsi::secondary_san_login: {get_param: CinderDellScSecondarySanLogin} 100 cinder::backend::dellsc_iscsi::secondary_san_login: {get_param: CinderDellScSecondarySanLogin}
98 cinder::backend::dellsc_iscsi::secondary_san_password: {get_param: CinderDellScSecondarySanPassword} 101 cinder::backend::dellsc_iscsi::secondary_san_password: {get_param: CinderDellScSecondarySanPassword}
99 cinder::backend::dellsc_iscsi::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort} 102 cinder::backend::dellsc_iscsi::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort}
103 cinder::backend::dellsc_iscsi::excluded_domain_ip: {get_param: CinderDellScExcludedDomainIp}
100 step_config: | 104 step_config: |
101 include ::tripleo::profile::base::cinder::volume 105 include ::tripleo::profile::base::cinder::volume