Remove pluginsync setting if upgrading to 1.4.x #97
Conversation
tphoney
changed the title
tphoney
force-pushed
the
pe-14495
branch
4 times, most recently
from
4782f66 to
2ac6a6e
Compare
| @@ -26,7 +26,14 @@ | |||
| # Deprecated for global config | |||
| 'config_version', 'manifest', 'modulepath', | |||
| # Settings that should be reset to defaults | |||
| 'disable_warnings', 'vardir', 'rundir', 'libdir', 'confdir', 'ssldir', 'classfile'].each |$setting| { | |||
| 'disable_warnings', 'vardir', 'rundir', 'libdir', 'confdir', 'ssldir', 'classfile'] | |||
There was a problem hiding this comment.
Indentation looks off.
tphoney
force-pushed
the
pe-14495
branch
2 times, most recently
from
45283f5 to
ec0228e
Compare
|
This will only cleanup the settings on upgrades from <= 3.8 (see |
|
Oh yeah... might need another class to cover new deprecations. |
| 'disable_warnings', 'vardir', 'rundir', 'libdir', 'confdir', 'ssldir', 'classfile'].each |$setting| { | ||
| 'disable_warnings', 'vardir', 'rundir', 'libdir', 'confdir', 'ssldir', 'classfile'] | ||
| # When upgrading to 1.4.x or later remove pluginsync | ||
| if versioncmp($::puppet_agent::package_version, '1.4.0') >= 0 { |
There was a problem hiding this comment.
This only works if we move https://github.com/puppetlabs/puppetlabs-puppet_agent/blob/master/manifests/init.pp#L38-L42 to params.pp.
Something like d1dc946.
There was a problem hiding this comment.
We should also handle undef. If we get this far with undef, it means we're updating to FOSS latest, so we should also remove pluginsync in that case.
|
@MikaelSmith @highb I made the suggested changes. Sorry for the ping pong nature of this. |
|
This needs a rebase now, and you could remove the WIP note. |
tphoney
changed the title
|
👍 |
|
Oh, should probably add a spec. I'll add it and put up a new PR. |
|
Put up a new PR at #101. |
No description provided.