devsnack/control-repo
1
0
Fork 0
Code Releases Activity

Add data type validation to pe_postgresql_management profile

Browse Source 
Prior to this commit 3 of the 4 parameters were not validated.

After this commit, the parameters are correctly validated.

Due to MODULES-2960 $autovacuum_scale_factor is validated as a float
but then is converted to a string to pass it to the value attribute
of postgresql_conf.
This commit is contained in:
Nick Walker 2016-01-11 09:47:16 -08:00
parent edba37efb1
commit acf1cf7ffd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
site/profile/manifests/pe_postgresql_management.pp
View File

@ -1,8 +1,8 @@
class profile::pe_postgresql_management ( class profile::pe_postgresql_management (
$autovacuum_scale_factor = '.01', Float[0,1] $autovacuum_scale_factor = 0.01,
$manage_postgresql_service = true, Boolean $manage_postgresql_service = true,
$all_in_one_pe_install = true, Boolean $all_in_one_pe_install = true,
Boolean $include_pe_databases_maintenance = true, Boolean $include_pe_databases_maintenance = true,
) { ) {
$postgresql_service_resource_name = 'postgresqld' $postgresql_service_resource_name = 'postgresqld'
@ -25,11 +25,13 @@ class profile::pe_postgresql_management (
} }
} }
#The value attribute of postgresql_conf requires a string despite validating a float above
#https://tickets.puppetlabs.com/browse/MODULES-2960
#http://www.postgresql.org/docs/9.4/static/runtime-config-autovacuum.html #http://www.postgresql.org/docs/9.4/static/runtime-config-autovacuum.html
postgresql_conf { ['autovacuum_vacuum_scale_factor', 'autovacuum_analyze_scale_factor'] : postgresql_conf { ['autovacuum_vacuum_scale_factor', 'autovacuum_analyze_scale_factor'] :
ensure => present, ensure => present,
target => '/opt/puppetlabs/server/data/postgresql/9.4/data/postgresql.conf', target => '/opt/puppetlabs/server/data/postgresql/9.4/data/postgresql.conf',
value => $autovacuum_scale_factor, value => "${autovacuum_scale_factor}",
notify => $notify_postgresql_service, notify => $notify_postgresql_service,
} }