]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Remove deprecation notice for sectionless ceilometer_config
authorSebastien Badia <sebastien.badia@enovance.com>
Sat, 12 Jul 2014 00:20:30 +0000 (02:20 +0200)
committerSebastien Badia <sebastien.badia@enovance.com>
Sat, 12 Jul 2014 00:20:30 +0000 (02:20 +0200)
ceilometer_config used to accept section-less configuration name.

Change-Id: I11348ced3bccb1bb88ae493ae1e15017aa360096

lib/puppet/type/ceilometer_config.rb

index 3369c1042ad90240067d5b7854bbc56d277d7c57..77215b251537f3676f6832169f94c6c8fddc9aad 100644 (file)
@@ -4,11 +4,7 @@ Puppet::Type.newtype(:ceilometer_config) do
 
   newparam(:name, :namevar => true) do
     desc 'Section/setting name to manage from ceilometer.conf'
-    validate do |value|
-      unless value =~ /\S+\/\S+/
-        fail("Invalid ceilometer_config #{value}, entries without sections are no longer supported, please add an explicit section (probably DEFAULT) to all ceilometer_config resources")
-      end
-    end
+    newvalues(/\S+\/\S+/)
   end
 
   newproperty(:value) do
@@ -45,12 +41,4 @@ Puppet::Type.newtype(:ceilometer_config) do
     defaultto false
   end
 
-  validate do
-    if self[:ensure] == :present
-      if self[:value].nil?
-        raise Puppet::Error, "Property value must be set for #{self[:name]} when ensure is present"
-      end
-    end
-  end
-
 end