From 4ebc9ac8f3dc661ce328a0ce0a3154309d036354 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 9 Dec 2020 22:00:02 +0100 Subject: [PATCH] Disable SwiftDisperion when deploying Ceph RGW While not causing the deployment to fail, we should disable the SwiftDispersion service when Ceph RGW is deployed. Change-Id: I329380afb07bb62126cf57e39167bc2b20506b6c Closes-Bug: #1907501 --- environments/ceph-ansible/ceph-rgw.yaml | 1 + environments/swift-external.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/environments/ceph-ansible/ceph-rgw.yaml b/environments/ceph-ansible/ceph-rgw.yaml index 0cf3495c51..7a4341576c 100644 --- 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 diff --git a/environments/swift-external.yaml b/environments/swift-external.yaml index 97cae811bb..0f0f6fa969 100644 --- 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