Set prerun_command with inifile instead of augeas #13
Conversation
| @@ -38,6 +41,7 @@ | |||
| $modulepath = "${r10k_basedir}/\$environment/modules" | |||
| $pe_ruby = false | |||
| } | |||
| $puppet_conf = "${puppetconf_path}/puppet.conf" | |||
There was a problem hiding this comment.
So I think $confdir is probobly a safe bet here in lieu of passing it in
There was a problem hiding this comment.
Sorry, I don't follow, do you want me to change $puppet_conf value to $confdir/puppet.conf? If so, should I also remove $puppetconf_path from that file (and replace it everywhere with $confdir)?
There was a problem hiding this comment.
scratch that, I got it
|
If you can refactor based on the feedback , I will get this merged , thanks for the contribution! Augeas lack of white space support annoys me too :) |
both comments fixed and tested
Thank you for this awesome module! |
This also fixes the deprecation warning of `r10k synchronize`
| ) inherits r10k::params { | ||
|
|
||
| Ini_setting { | ||
| path => "$puppetconf_path/puppet.conf", |
There was a problem hiding this comment.
I don't see where $puppetconf_path is being declared, I think it either needs to be added to params and redeclared as a local var like $command or perhaps just changed to $::confdir as previously discussed.
There was a problem hiding this comment.
It is in r10k::params::puppetconf_path, lines 23 and 33 in master :)
There was a problem hiding this comment.
;) I have merged but I think we should probably fully qualify the var as $r10k::params::puppetconf_path or redefine it as a param.
Set prerun_command with inifile instead of augeas
This also fixes the deprecation warning of
r10k synchronizepuppetlabs/inifile is already listed as dependency in the Modulefile (although it doesn't seem to be used anywhere so far)