Merge "Provide manage_service to neutron::agents::ml2::ovs"

[apex-tripleo-heat-templates.git] / puppet / ceph-cluster-config.yaml

diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index f467312..33b1857 100644 (file)
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Ceph Cluster config data for Puppet'
 
 parameters:
@@ -36,7 +36,6 @@ resources:
                   - {get_param: ceph_mon_ips}
                 ceph::profile::params::fsid: {get_param: ceph_fsid}
                 ceph::profile::params::mon_key: {get_param: ceph_mon_key}
-                ceph::profile::params::osds: "{/srv/data: {}}"
                 # We should use a separated key for the non-admin clients
                 ceph::profile::params::client_keys:
                   str_replace: