Merge "Disable SwiftDisperion when deploying Ceph RGW"
This commit is contained in:
commit
93a6f9d4cf
@ -1,5 +1,6 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
|
OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
|
||||||
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
||||||
|
OS::TripleO::Services::SwiftDispersion: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::ExternalSwiftProxy: ../deployment/swift/external-swift-proxy-baremetal-puppet.yaml
|
OS::TripleO::Services::ExternalSwiftProxy: ../deployment/swift/external-swift-proxy-baremetal-puppet.yaml
|
||||||
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
||||||
|
OS::TripleO::Services::SwiftDispersion: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user