openstack
/
puppet-ceilometer
Code Issues Proposed changes

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
This commit is contained in:
Jake Yip 2017-05-23 16:04:07 +10:00
parent 917605c850
commit 6170a18bf5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb
View File

@ -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

2
lib/puppet/type/ceilometer_api_paste_ini.rb
View File

@ -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

2
manifests/config.pp
View File

@ -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.