Merge "Set os-refresh-config timeout to 4 hours"

[apex-tripleo-heat-templates.git] / environments / puppet-ceph-devel.yaml

diff --git a/environments/puppet-ceph-devel.yaml b/environments/puppet-ceph-devel.yaml
index d782e8d..ad542be 100644 (file)
--- a/environments/puppet-ceph-devel.yaml
+++ b/environments/puppet-ceph-devel.yaml
@@ -1,8 +1,12 @@
 # A Heat environment file which can be used to enable a Ceph
-# storage cluster using the controller and 2 ceph nodes.
-# Rbd backends are enabled for Cinder, Glance, and Nova.
-parameters:
-  CephStorageCount: 2
+# storage cluster using the controller and ceph nodes.
+# Rbd backends are enabled for Cinder, Glance, Gnocchi and Nova.
+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
+
+parameter_defaults:
   #NOTE: These ID's and keys should be regenerated for
   # a production deployment. What is here is suitable for
   # developer and CI testing only.
@@ -12,5 +16,5 @@ parameters:
   NovaEnableRbdBackend: true
   CinderEnableRbdBackend: true
   GlanceBackend: rbd
+  GnocchiBackend: rbd
   CinderEnableIscsiBackend: false
-  ControllerEnableCephStorage: true