openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix enable-ceph sample environment

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

Change-Id: I6a9b148514fc5da1f96b9fd7fe09f564c2f82419
This commit is contained in:
Ben Nemec 2017-07-13 10:44:16 -05:00 committed by Emilien Macchi
parent 0d469e82e8
commit 56bf9cfb78
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environments/puppet-ceph.yaml
View File

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

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

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