openstack/fuel-library
Code Issues Proposed changes

update seperator regex in inifille

Browse Source
This commit is contained in:
Andrew Woodward
2013-09-16 15:13:41 -07:00
parent 75454d505c
commit 1448d95de2
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/ceph/manifests/init.pp
View File

@@ -54,7 +54,6 @@ class ceph (
}
resources {'ceph_conf':
require => Exec['ceph-deploy init config'],
key_val_separator => ' = ',
}
ceph_conf {
'global/auth supported': value => $auth_supported;

6
deployment/puppet/inifile/lib/puppet/util/ini_file.rb
View File

@@ -6,13 +6,13 @@ module Util
class IniFile
def section_regex
/^\s*\[([\w\d\.\\\/\-\:]+)\]\s*$/
/^\s*\[([\w\d\.\\\/\-\:]+)\]\s*$/
end
def setting_regex
/^(\s*)([\w\d\.\\\/\-]+)(\s*=\s*)([\S\s]*\S)\s*$/
/^(\s*)([\w\d\.\\\/\-\s]*[\w\d\.\\\/\-])([ \t]*=[ \t]*)([\S\s]*?)\s*$/
end
def commented_setting_regex
/^(\s*)[#;]+(\s*)([\w\d\.\\\/\-]+)(\s*=\s*)([\S\s]*\S)\s*$/
/^(\s*)[#;]+(\s*)([\w\d\.\\\/\-]+)([ \t]*=[ \t]*)([\S\s]*?)\s*$/
end
def initialize(path, key_val_separator = ' = ')