Fix filename of api_paste.ini

The default filename is api_paste.ini, not api-paste.ini. Since we do
not have an option to set the file name using
[DEFAULT]/api_paste_config, we should fix the default to make sure it
works.

Change-Id: I054af2663a376b5ec2a0606437ff3fb90c00934a

diff --git a/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb b/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb
index 5ff506b3f2062a87954332d4f46ab26ac8a7ea4f..2a08cb4f2b87d7237910f7653c98eec323e87005 100644 (file)
--- a/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb
+++ b/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb
@@ -16,7 +16,7 @@ Puppet::Type.type(:ceilometer_api_paste_ini).provide(
   end
 
   def self.file_path
-    '/etc/ceilometer/api-paste.ini'
+    '/etc/ceilometer/api_paste.ini'
   end
 
   # added for backwards compatibility with older versions of inifile

diff --git a/lib/puppet/type/ceilometer_api_paste_ini.rb b/lib/puppet/type/ceilometer_api_paste_ini.rb
index ad0ebf2e9ef364166bbf85efad4652073ac745c2..3428b95c4e0dbdf83193b3b0a1a81a119eb766d0 100644 (file)
--- a/lib/puppet/type/ceilometer_api_paste_ini.rb
+++ b/lib/puppet/type/ceilometer_api_paste_ini.rb
@@ -3,7 +3,7 @@ Puppet::Type.newtype(:ceilometer_api_paste_ini) do
   ensurable
 
   newparam(:name, :namevar => true) do
-    desc 'Section/setting name to manage from /etc/ceilometer/api-paste.ini'
+    desc 'Section/setting name to manage from /etc/ceilometer/api_paste.ini'
     newvalues(/\S+\/\S+/)
   end
 

diff --git a/manifests/config.pp b/manifests/config.pp
index 6635d95f41463e8fad4a98446d26069640e81564..2c0e97575b44deb3a6a37456814642d83fd76fab 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -20,7 +20,7 @@
 #       value: barValue
 #
 # [*ceilometer_api_paste_ini*]
-#   (optional) Allow configuration of /etc/ceilometer/api-paste.ini options.
+#   (optional) Allow configuration of /etc/ceilometer/api_paste.ini options.
 #
 #   NOTE: The configuration MUST NOT be already handled by this module
 #   or Puppet catalog compilation will fail with duplicate resources.