Browse Source

Fix enable-ceph sample environment

The necessary resource registry entries were missing from this env
and the old environment was not deprecated.

Change-Id: I6a9b148514fc5da1f96b9fd7fe09f564c2f82419
changes/53/483453/3
Ben Nemec 4 years ago
committed by Emilien Macchi
parent
commit
56bf9cfb78
  1. 4
      environments/puppet-ceph.yaml
  2. 4
      environments/storage/enable-ceph.yaml
  3. 4
      sample-env-generator/storage.yaml

4
environments/puppet-ceph.yaml

@ -1,3 +1,7 @@
# ****************************************************************************
# DEPRECATED: Use tripleo-heat-templates/environments/storage/enable-ceph.yaml
# instead.
# ****************************************************************************
resource_registry:
OS::TripleO::Services::CephMon: ../puppet/services/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../puppet/services/ceph-osd.yaml

4
environments/storage/enable-ceph.yaml

@ -33,3 +33,7 @@ parameter_defaults:
# Type: boolean
NovaEnableRbdBackend: True
resource_registry:
OS::TripleO::Services::CephClient: ../../puppet/services/ceph-client.yaml
OS::TripleO::Services::CephMon: ../../puppet/services/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../puppet/services/ceph-osd.yaml

4
sample-env-generator/storage.yaml

@ -26,6 +26,10 @@ environments:
NovaEnableRbdBackend: True
GlanceBackend: rbd
GnocchiBackend: rbd
resource_registry:
OS::TripleO::Services::CephMon: ../../puppet/services/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../puppet/services/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../puppet/services/ceph-client.yaml
description: |
Include this environment to enable Ceph as the backend for
Cinder, Nova, Gnocchi, and Glance.

Loading…
Cancel
Save