Merge "Neutron L3 service cleanups for hiera json hook"

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

diff --git a/environments/puppet-ceph-external.yaml b/environments/puppet-ceph-external.yaml
index f22967f..06e4f7a 100644 (file)
--- a/environments/puppet-ceph-external.yaml
+++ b/environments/puppet-ceph-external.yaml
@@ -1,23 +1,34 @@
 # A Heat environment file which can be used to enable the
 # use of an externally managed Ceph cluster.
 resource_registry:
-  OS::TripleO::CephClusterConfig::SoftwareConfig: ../puppet/extraconfig/ceph/ceph-external-config.yaml
+  OS::TripleO::Services::CephExternal: ../puppet/services/ceph-external.yaml
+  OS::TripleO::Services::CephMon: OS::Heat::None
+  OS::TripleO::Services::CephClient: OS::Heat::None
+  OS::TripleO::Services::CephOSD: OS::Heat::None
 
 parameter_defaults:
-  # NOTE: These example parameters are required when using Ceph External
+  # NOTE: These example parameters are required when using CephExternal
   #CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
   #CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
   #CephExternalMonHost: '172.16.1.7, 172.16.1.8'
 
-  # the following parameters enable Ceph backends for Cinder, Glance, and Nova
+  # the following parameters enable Ceph backends for Cinder, Glance, Gnocchi and Nova
   NovaEnableRbdBackend: true
   CinderEnableRbdBackend: true
+  CinderBackupBackend: ceph
   GlanceBackend: rbd
+  GnocchiBackend: rbd
   # If the Ceph pools which host VMs, Volumes and Images do not match these
-  # names, edit the following as needed.
+  # names OR the client keyring to use is not named 'openstack',  edit the
+  # following as needed.
   NovaRbdPoolName: vms
   CinderRbdPoolName: volumes
   GlanceRbdPoolName: images
+  GnocchiRbdPoolName: metrics
+  CephClientUserName: openstack
 
   # finally we disable the Cinder LVM backend
   CinderEnableIscsiBackend: false
+
+  # Backward compatibility setting, will be removed in the future
+  CephAdminKey: ''