Merge "Disable SwiftDisperion when deploying Ceph RGW"

2 years ago · 93a6f9d4cf
parent 352a1ee4a3 4ebc9ac8f3
commit 93a6f9d4cf
2 changed files with 2 additions and 0 deletions
--- a/environments/ceph-ansible/ceph-rgw.yaml
+++ b/environments/ceph-ansible/ceph-rgw.yaml
@ -1,5 +1,6 @@
 resource_registry:
  OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
  OS::TripleO::Services::SwiftProxy: OS::Heat::None
+  OS::TripleO::Services::SwiftDispersion: OS::Heat::None
  OS::TripleO::Services::SwiftStorage: OS::Heat::None
  OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
--- a/environments/swift-external.yaml
+++ b/environments/swift-external.yaml
@ -1,6 +1,7 @@
 resource_registry:
  OS::TripleO::Services::ExternalSwiftProxy: ../deployment/swift/external-swift-proxy-baremetal-puppet.yaml
  OS::TripleO::Services::SwiftProxy: OS::Heat::None
+  OS::TripleO::Services::SwiftDispersion: OS::Heat::None
  OS::TripleO::Services::SwiftStorage: OS::Heat::None
  OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None