(PE-14495) Remove pluginsync setting if upgrading to 1.4.x #101
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
MikaelSmith
force-pushed
the
tphoney-pe-14495
branch
from
a1d1444 to
86457d1
Compare
|
|
||
| # When upgrading to 1.4.x or later remove pluginsync | ||
| if ($package_version == undef and $old_packages) or (versioncmp($package_version, '1.4.0') >= 0) { | ||
| $removedSettings = $_removedSettings + ['pluginsync'] |
There was a problem hiding this comment.
I still want to guard this if the setting is already present.
MikaelSmith
force-pushed
the
tphoney-pe-14495
branch
from
86457d1 to
e8590ab
Compare
|
+1 |
|
Ran this thorough a 2015.3.2->2015.3.x upgrade and I'm getting: |
| $removedSettings = $_removedSettings | ||
| } | ||
|
|
||
| if $removedSettings { |
There was a problem hiding this comment.
I can't remember, are arrays truthy in puppet now? Perhaps we need to be checking !empty and not truth?
There was a problem hiding this comment.
Ah, yep. Tested with Puppet 4:
# test.pp
$array = []
if $array {
notify {'array is true':}
}else{
notify {'array is false':}
}
~ puppet apply test.pp
WARN: Unresolved specs during Gem::Specification.reset:
hiera (< 4, >= 2.0)
json_pure (>= 0)
WARN: Clearing out unresolved specs.
Please report a bug if this causes problems.
Notice: Compiled catalog for brandonhighmbp.corp.puppetlabs.net in environment production in 0.04 seconds
Notice: array is true
Notice: /Stage[main]/Main/Notify[array is true]/message: defined 'message' as 'array is true'
Notice: Applied catalog in 0.01 seconds
There was a problem hiding this comment.
Although... the .each won't iterate over an empty array.
There was a problem hiding this comment.
I assumed incorrectly there.
Update: I'm relying on [].each doing nothing. The if statement is probably not necessary now, because I make sure there's always at least an empty array.
There was a problem hiding this comment.
Yeah, we can probably remove the if. As for my comment about the .each, I'm just trying to figure out where no implicit conversion of nil into String is coming from.
MikaelSmith
force-pushed
the
tphoney-pe-14495
branch
2 times, most recently
from
56824b9 to
f1a6837
Compare
|
Ok, made updates. |
|
@MikaelSmith The puppet.conf dep is still causing issues: |
|
Oh, that's interesting. |
MikaelSmith
force-pushed
the
tphoney-pe-14495
branch
from
f1a6837 to
0e33a7c
Compare
|
Apparently the file needs to be managed. Hopefully fixed by ensuring it's a file if not already managed. |
|
👍 agent_upgrade test passed with this change. |
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.
No description provided.