aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-21 07:14:02 +0000
committerGerrit Code Review <review@openstack.org>2017-04-21 07:14:02 +0000
commit6794e7c5567998d7833733edfbb02ff0a891c563 (patch)
treea5b8c76dcf6b6ec5ac8d933da20242571a54bfba
parent3fe155473f488900a61328168fb41426cf6c1f78 (diff)
parent485715c48b7311d604f0a71234dfa21e2bfbe7a9 (diff)
Merge "Update Dell EMC Cinder back end services" into stable/ocata
-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 1d0028b..65a727e 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -236,7 +236,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 8efc0f2..d3e08da 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -42,7 +42,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