summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-12 20:09:14 +0000
committerGerrit Code Review <review@openstack.org>2017-04-12 20:09:14 +0000
commit3e8b6289d708a858baa8460867926f871ab49ec0 (patch)
treeff86cabf8177a8f591f0c265591e16f2ff5feef4
parentc89fe8da72a1c751473b75d7a15713238ca2f603 (diff)
parent5fb637c611c3c8c4daf8e8d2f06d5579b9ef34fd (diff)
Merge "Update Dell EMC Cinder back end services"
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml3
-rw-r--r--roles_data.yaml3
2 files changed, 6 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index a53db6c6..b1780680 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -239,7 +239,10 @@ resource_registry:
OS::TripleO::Services::Zaqar: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
+ OS::TripleO::Services::CinderBackendDellPs: OS::Heat::None
+ OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None
OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None
+ OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None
OS::TripleO::Services::Etcd: OS::Heat::None
OS::TripleO::Services::Ec2Api: OS::Heat::None
diff --git a/roles_data.yaml b/roles_data.yaml
index c061abcb..eee6bf59 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -43,7 +43,10 @@
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
+ - OS::TripleO::Services::CinderBackendDellPs
+ - OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendNetApp
+ - OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::Congress
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone