(MODULES-8086) Puppet 5 and 6: wrong urls for windows msi #334
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
ekinanp
approved these changes
Oct 12, 2018
smcclellan
suggested changes
Oct 15, 2018
manifests/windows/install.pp
Outdated
| @@ -19,7 +19,12 @@ | |||
| $_https_source = "https://pm.puppetlabs.com/puppet-agent/${_pe_server_version}/${_agent_version}/repos/windows/${package_file_name}" | |||
| } | |||
| else { | |||
| $_https_source = "https://downloads.puppetlabs.com/windows/${package_file_name}" | |||
| $dir = $package_file_name ? { | |||
| /.*-5\..*/ => 'puppet5/', | |||
There was a problem hiding this comment.
Can this regex be a bit more specialized, to ensure it only matches what we expect? E.g. puppet-agent-5\..* might be better.
There was a problem hiding this comment.
I'm curious whether this $dir value could just be derived from $::puppet_agent::collection, which will be set to PC1 (for puppet 4), puppet5, or puppet6 -- I will take a look and see if that could work.
There was a problem hiding this comment.
This could work, but the collection will still be the default (PC1) at this point unless someone has specified a value for it explicitly -- using a regex on the package name does seem to be the correct way to get this done
caseywilliams
approved these changes
Oct 15, 2018
smcclellan
approved these changes
Oct 18, 2018
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.
Correct URLs for windows msis (Puppet 5 and 6)