Remove classfile puppet.conf setting, update for PE windows #56
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit adds the puppet.conf classfile setting to the list of settings to be reset during agent ugprade. This is needed primarily for PE users as the path to that file was set to a different directory at install time. With the new AIO agent, that file location has changed. To bring things closer to parity and to continue configuring PE users mcollective with mco inventory support, `classfile` is no longer being managed at install time in PE. This commit brings it full circle by essentially undoing PE's previous one-time configuration of the `classfile` setting.
Previous to this commit, the windows agent upgrade code would always use the latest agent version available. In PE, the agent version should be tied to the master's. However Windows does not have a curl like function in powershell v2 that supports self signed certificates. This commit overrides the source url if not specified and the user is in a PE environment to use the PE download url, specifing the agent version, sourced from the compiling master.
|
Ping @cyberious @jpartlow |
|
👍 |
| @@ -12,8 +12,17 @@ | |||
| default => $::puppet_agent::arch | |||
| } | |||
|
|
|||
| if $::puppet_agent::is_pe { | |||
There was a problem hiding this comment.
So crazy question, once someone is on the AIO agent and uses this for the next upgrade...
There was a problem hiding this comment.
@ferventcoder I think this line is handling that, albeit in a somewhat roundabout way: https://github.com/puppetlabs/puppetlabs-puppet_agent/blob/master/manifests/params.pp#L13
There was a problem hiding this comment.
Also not explicitly supported, we'll have to verify when we enable running on Puppet 4 agents.
jpartlow
added a commit
that referenced
this pull request
Jul 24, 2015
Remove classfile puppet.conf setting, update for PE windows
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains two fixes for PE users:
The first is reseting the
classfilepuppet.conf setting for mco inventory. The second is specifying the agent version to that of the compiling master instead of latest.