From 61aadfc5dd54a71ae0b3bdbbd75a6b82a4da7cc0 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 26 Jul 2017 09:26:33 +0800 Subject: [PATCH] Fix filename of api_paste.ini Change-Id: Ib5120da8ae706a1314700364597d53071e48607b Closes-Bug: #1706473 --- lib/puppet/provider/aodh_api_paste_ini/ini_setting.rb | 2 +- lib/puppet/type/aodh_api_paste_ini.rb | 2 +- manifests/config.pp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/puppet/provider/aodh_api_paste_ini/ini_setting.rb b/lib/puppet/provider/aodh_api_paste_ini/ini_setting.rb index b191feba..d2b7f3bf 100644 --- a/lib/puppet/provider/aodh_api_paste_ini/ini_setting.rb +++ b/lib/puppet/provider/aodh_api_paste_ini/ini_setting.rb @@ -16,7 +16,7 @@ Puppet::Type.type(:aodh_api_paste_ini).provide( end def self.file_path - '/etc/aodh/api_paste.ini' + '/etc/aodh/api-paste.ini' end # added for backwards compatibility with older versions of inifile diff --git a/lib/puppet/type/aodh_api_paste_ini.rb b/lib/puppet/type/aodh_api_paste_ini.rb index 1f5df52f..391f9dcf 100644 --- a/lib/puppet/type/aodh_api_paste_ini.rb +++ b/lib/puppet/type/aodh_api_paste_ini.rb @@ -3,7 +3,7 @@ Puppet::Type.newtype(:aodh_api_paste_ini) do ensurable newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from /etc/aodh/api_paste.ini' + desc 'Section/setting name to manage from /etc/aodh/api-paste.ini' newvalues(/\S+\/\S+/) end diff --git a/manifests/config.pp b/manifests/config.pp index f1b9b976..d6c3b456 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -18,7 +18,7 @@ # value: barValue # # [*aodh_api_paste_ini*] -# (optional) Allow configuration of /etc/aodh/api_paste.ini options. +# (optional) Allow configuration of /etc/aodh/api-paste.ini options. # # NOTE: The configuration MUST NOT be already handled by this module # or Puppet catalog compilation will fail with duplicate resources.