Browse Source

Merge "Deploy RGW by default when cephadm environment is included"

changes/44/787644/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
3cde41c5bf
4 changed files with 28 additions and 6 deletions
  1. +1
    -0
      ci/environments/scenario001-standalone.yaml
  2. +0
    -5
      environments/cephadm/ceph-rgw.yaml
  3. +22
    -0
      environments/cephadm/cephadm-rbd-only.yaml
  4. +5
    -1
      environments/cephadm/cephadm.yaml

+ 1
- 0
ci/environments/scenario001-standalone.yaml View File

@ -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


+ 0
- 5
environments/cephadm/ceph-rgw.yaml View File

@ -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

+ 22
- 0
environments/cephadm/cephadm-rbd-only.yaml View File

@ -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

+ 5
- 1
environments/cephadm/cephadm.yaml View File

@ -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:


Loading…
Cancel
Save