X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=environments%2Fstorage-environment.yaml;h=2529ea1475bd04f1c834fa7426f604899930b8a9;hb=62d6d5d9338c4cefeca5c8a7a1a3ec3f9bd89a53;hp=e1cafd2bd3ac173b6f0257808167d5f00731accd;hpb=7d60f728d09757e8a6728227132b0c72c8e0e752;p=apex-tripleo-heat-templates.git

diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml
index e1cafd2b..2529ea14 100644
--- a/environments/storage-environment.yaml
+++ b/environments/storage-environment.yaml
@@ -1,6 +1,11 @@
 ## A Heat environment file which can be used to set up storage
 ## backends. Defaults to Ceph used as a backend for Cinder, Glance and
 ## Nova ephemeral storage.
+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:
 
   #### BACKEND SELECTION ####
@@ -34,6 +39,8 @@ parameter_defaults:
   ## File system type of the mount
   # GlanceFilePcmkFstype: nfs
   ## Pacemaker mount point, e.g. '192.168.122.1:/export/glance' for NFS
+  ##  (If using IPv6, use both double- and single-quotes,
+  ##  e.g. "'[fdd0::1]:/export/glance'")
   # GlanceFilePcmkDevice: ''
   ## Options for the mount managed by Pacemaker
   # GlanceFilePcmkOptions: ''
@@ -41,10 +48,6 @@ parameter_defaults:
 
   #### CEPH SETTINGS ####
 
-  ## Whether to deploy Ceph OSDs on the controller nodes. By default
-  ## OSDs are deployed on dedicated ceph-storage nodes only.
-  # ControllerEnableCephStorage: false
-
   ## When deploying Ceph Nodes through the oscplugin CLI, the following
   ## parameters are set automatically by the CLI. When deploying via
   ## heat stack-create or ceph on the controller nodes only,