From 6170a18bf5c7bb37afc218bbe42edfafcd0729a7 Mon Sep 17 00:00:00 2001 From: Jake Yip Date: Tue, 23 May 2017 16:04:07 +1000 Subject: [PATCH] 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 --- lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb | 2 +- lib/puppet/type/ceilometer_api_paste_ini.rb | 2 +- manifests/config.pp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 5ff506b..2a08cb4 100644 --- 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 ad0ebf2..3428b95 100644 --- 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 6635d95..2c0e975 100644 --- 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. -- 2.45.2