From 56bf9cfb7857af1607b2539a705916b8323bbe1a Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 13 Jul 2017 10:44:16 -0500 Subject: [PATCH] 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 --- environments/puppet-ceph.yaml | 4 ++++ environments/storage/enable-ceph.yaml | 4 ++++ sample-env-generator/storage.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/environments/puppet-ceph.yaml b/environments/puppet-ceph.yaml index 57af540a49..2b4dfa0536 100644 --- a/environments/puppet-ceph.yaml +++ b/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 diff --git a/environments/storage/enable-ceph.yaml b/environments/storage/enable-ceph.yaml index c629f74be8..596ec16eb0 100644 --- a/environments/storage/enable-ceph.yaml +++ b/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 diff --git a/sample-env-generator/storage.yaml b/sample-env-generator/storage.yaml index aa0385cc52..dc4fbb10c6 100644 --- a/sample-env-generator/storage.yaml +++ b/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.