From ca726ae16daa8574df1c4d2b214d510d3dd44d3a Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Sat, 12 Jul 2014 02:20:30 +0200 Subject: [PATCH] Remove deprecation notice for sectionless ceilometer_config ceilometer_config used to accept section-less configuration name. Change-Id: I11348ced3bccb1bb88ae493ae1e15017aa360096 --- lib/puppet/type/ceilometer_config.rb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/puppet/type/ceilometer_config.rb b/lib/puppet/type/ceilometer_config.rb index 3369c104..77215b25 100644 --- a/lib/puppet/type/ceilometer_config.rb +++ b/lib/puppet/type/ceilometer_config.rb @@ -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