aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-06 06:34:44 +0000
committerGerrit Code Review <review@openstack.org>2017-09-06 06:34:44 +0000
commit1b3264c2ad7a5ac3cfdf3f37dd6e899ee7063cfa (patch)
tree2a48a5c540daaee5de9e7da8d33c1ca532ed608e /overcloud-resource-registry-puppet.j2.yaml
parent8431e7412ab8fd7a77befafd0ab687be599ad970 (diff)
parent9757cfaeedf05e578e0357769be82d7b125c04ff (diff)
Merge "Add support for Dell EMC VMAX Manila Backend" into stable/pike
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index b8819e74..bc14adb0 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -233,6 +233,7 @@ resource_registry:
OS::TripleO::Services::ManilaBackendGeneric: OS::Heat::None
OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
+ OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None