diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-16 16:33:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-16 16:33:14 +0000 |
| commit | c20e85a3b31c537c98ea3f178f4840744f82d7d4 (patch) | |
| tree | 6a61eea9f8aacf9f24508668718fc672b91a4d1f | |
| parent | 8be72939201a9b38193d01dae7d059840df16470 (diff) | |
| parent | 3f053a91db788259360760a4d8e3b6f85dbb8475 (diff) | |
Merge "Dell SC: Add exclude_domain_ip option" into stable/ocata
| -rw-r--r-- | environments/cinder-dellsc-config.yaml | 1 | ||||
| -rw-r--r-- | puppet/services/cinder-backend-dellsc.yaml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/environments/cinder-dellsc-config.yaml b/environments/cinder-dellsc-config.yaml index 99e517bf..681a2fe9 100644 --- a/environments/cinder-dellsc-config.yaml +++ b/environments/cinder-dellsc-config.yaml @@ -19,3 +19,4 @@ parameter_defaults: CinderDellScSecondarySanLogin: 'Admin' CinderDellScSecondarySanPassword: '' CinderDellScSecondaryScApiPort: 3033 + CinderDellScExcludedDomainIp: '' diff --git a/puppet/services/cinder-backend-dellsc.yaml b/puppet/services/cinder-backend-dellsc.yaml index cd207257..8360a341 100644 --- a/puppet/services/cinder-backend-dellsc.yaml +++ b/puppet/services/cinder-backend-dellsc.yaml @@ -61,6 +61,9 @@ parameters: CinderDellScSecondaryScApiPort: type: number default: 3033 + CinderDellScExcludedDomainIp: + type: string + default: '' ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -97,5 +100,6 @@ outputs: 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} + cinder::backend::dellsc_iscsi::excluded_domain_ip: {get_param: CinderDellScExcludedDomainIp} step_config: | include ::tripleo::profile::base::cinder::volume |