aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrajinir <rajini_ram@dell.com>2017-04-10 13:21:38 -0500
committerrajinir <rajini_ram@dell.com>2017-06-15 10:33:25 -0500
commit3f053a91db788259360760a4d8e3b6f85dbb8475 (patch)
tree2addd44950e1d68dc795c540488c963c51e20692
parent61d2dfc01f022774b5967e3da67f368759f51a78 (diff)
Dell SC: Add exclude_domain_ip option
This option allows users to exclude some fault domains. Otherwise all domains are returned. Change-Id: Iefd1a44c8fe217aee5845bba35def571317bb123 Closes-Bug: #1681490 Depends-On: I6eb2bcc7db003a5eebd3924e3e4eb44e35f60483 (cherry picked from commit e0bc8d6813d7cd0ecbef1dfe17d9d3cfec4225d7)
-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:
CinderDellScSecondarySanLogin: 'Admin'
CinderDellScSecondarySanPassword: ''
CinderDellScSecondaryScApiPort: 3033
+ 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:
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