diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-14 15:06:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-14 15:06:30 +0000 |
| commit | e9cf19340a070362bc39cd1a69d38ca742bb645a (patch) | |
| tree | 30cbffc5acf6a15daca604c52afbb4023551b569 | |
| parent | 112236f8bb06c6267291d0d557c06b5f3ba483b2 (diff) | |
| parent | e0bc8d6813d7cd0ecbef1dfe17d9d3cfec4225d7 (diff) | |
Merge "Dell SC: Add exclude_domain_ip option"
| -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 a201134c..c0bffb18 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 @@ -105,5 +108,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 |