From faf71068b0adf427b545ef0f9f1873bb638637bb Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Mon, 19 Apr 2021 09:52:34 +0200 Subject: [PATCH] Deploy RGW by default when cephadm environment is included This patch just includes the content of ceph-rgw.yaml in the common cephadm environment file. This means that when Ceph is deployed by TripleO, the RGW component will be applied using cephadm. The cephadm-rbd-only environment file is also added and can be applied for all the use cases where swift is used and rgw shouldn't replace it. Change-Id: I5e841ea76575eed28f1c8fc9a95cd4d3fd62dbc4 --- ci/environments/scenario001-standalone.yaml | 1 + environments/cephadm/ceph-rgw.yaml | 5 ----- environments/cephadm/cephadm-rbd-only.yaml | 22 +++++++++++++++++++++ environments/cephadm/cephadm.yaml | 6 +++++- 4 files changed, 28 insertions(+), 6 deletions(-) delete mode 100644 environments/cephadm/ceph-rgw.yaml create mode 100644 environments/cephadm/cephadm-rbd-only.yaml diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index dd6a0fff13..6bfc8b0d0c 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -10,6 +10,7 @@ resource_registry: OS::TripleO::Services::CephMon: ../../deployment/cephadm/ceph-mon.yaml OS::TripleO::Services::CephOSD: ../../deployment/cephadm/ceph-osd.yaml OS::TripleO::Services::CephClient: ../../deployment/cephadm/ceph-client.yaml + OS::TripleO::Services::CephRgw: ../../deployment/cephadm/ceph-rgw.yaml OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml OS::TripleO::Services::GnocchiApi: ../../deployment/gnocchi/gnocchi-api-container-puppet.yaml OS::TripleO::Services::GnocchiMetricd: ../../deployment/gnocchi/gnocchi-metricd-container-puppet.yaml diff --git a/environments/cephadm/ceph-rgw.yaml b/environments/cephadm/ceph-rgw.yaml deleted file mode 100644 index 859488456c..0000000000 --- a/environments/cephadm/ceph-rgw.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resource_registry: - OS::TripleO::Services::CephRgw: ../../deployment/cephadm/ceph-rgw.yaml - OS::TripleO::Services::SwiftProxy: OS::Heat::None - OS::TripleO::Services::SwiftStorage: OS::Heat::None - OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None diff --git a/environments/cephadm/cephadm-rbd-only.yaml b/environments/cephadm/cephadm-rbd-only.yaml new file mode 100644 index 0000000000..f9546f1b23 --- /dev/null +++ b/environments/cephadm/cephadm-rbd-only.yaml @@ -0,0 +1,22 @@ +resource_registry: + OS::TripleO::Services::CephClient: ../../deployment/cephadm/ceph-client.yaml + OS::TripleO::Services::CephMgr: ../../deployment/cephadm/ceph-mgr.yaml + OS::TripleO::Services::CephMon: ../../deployment/cephadm/ceph-mon.yaml + OS::TripleO::Services::CephOSD: ../../deployment/cephadm/ceph-osd.yaml + +parameter_defaults: + + CinderEnableIscsiBackend: false + CinderEnableRbdBackend: true + CinderBackupBackend: ceph + NovaEnableRbdBackend: true + GlanceBackend: rbd + ## Uncomment below if enabling legacy telemetry + # GnocchiBackend: rbd + + ## Set to enable on-wire encryption + ## Using secure mode can cause a performance degradation with the storage cluster. + ## The severity of the performance degradation can vary depending on several + ## environmental factors. + ## Test the performance impact in a non-production environment before implementing. + # CephMsgrSecureMode: true diff --git a/environments/cephadm/cephadm.yaml b/environments/cephadm/cephadm.yaml index f721d9fb55..f66668b1a3 100644 --- a/environments/cephadm/cephadm.yaml +++ b/environments/cephadm/cephadm.yaml @@ -1,8 +1,12 @@ resource_registry: + OS::TripleO::Services::CephClient: ../../deployment/cephadm/ceph-client.yaml OS::TripleO::Services::CephMgr: ../../deployment/cephadm/ceph-mgr.yaml OS::TripleO::Services::CephMon: ../../deployment/cephadm/ceph-mon.yaml OS::TripleO::Services::CephOSD: ../../deployment/cephadm/ceph-osd.yaml - OS::TripleO::Services::CephClient: ../../deployment/cephadm/ceph-client.yaml + OS::TripleO::Services::CephRgw: ../../deployment/cephadm/ceph-rgw.yaml + OS::TripleO::Services::SwiftProxy: OS::Heat::None + OS::TripleO::Services::SwiftStorage: OS::Heat::None + OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None parameter_defaults: