aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Bishop <abishop@redhat.com>2017-04-10 12:37:13 -0400
committerChristian Schwede <cschwede@redhat.com>2017-04-12 22:20:54 +0200
commit485715c48b7311d604f0a71234dfa21e2bfbe7a9 (patch)
tree21c7a3ee7cc8118f0e2f7ccf4bf8d458cf78a96e
parentd10aacc299c70ea582930056c1c94d222f76dfa8 (diff)
Update Dell EMC Cinder back end services
Add services for Dell EMC Cinder back ends to the resource registry and to the Controller role (defaulting to OS::Heat::None). Closes-Bug: #1681497 Change-Id: I694fd7738abd3601851bdcd38e3633607ce6152c (cherry picked from commit 5fb637c611c3c8c4daf8e8d2f06d5579b9ef34fd)
-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 1f240f0e..0181bb3b 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 8efc0f2a..d3e08da5 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