Use $is_pe for PE determination#122
Merged
kbarber merged 2 commits intopuppetlabs:masterfrom Feb 25, 2014
Merged
Conversation
...rather than the custom logic that was used previously. Using a uniform canon fact across all modules that need to differentiate between PE and POSS makes unusual situations (such as having a missing /opt/puppet/pe_version file) more, well, uniform.
The is_pe fact was first defined in stdlib in 3.1.0. We want to use that fact for making the "PE or Not PE" determination in params, so we need to require a stdlib at least that new. Note that at the time of commit the current version of stdlib is 4.1.0, so we're not exactly requiring bleeding edge.
kbarber
added a commit
that referenced
this pull request
Feb 25, 2014
Use $is_pe for PE determination
|
Just a little issue:
My machine now wants to manage |
Contributor
|
@raphink I know I know, there is a PR on this :-). Stop using master! |
|
I was just preparing a PR now: diff --git a/manifests/params.pp b/manifests/params.pp
index e85de90..0f98ab7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -50,7 +50,7 @@ class puppetdb::params {
}
}
- if $::is_pe {
+ if str2bool($::is_pe) {
$puppetdb_package = 'pe-puppetdb'
$puppetdb_service = 'pe-puppetdb'
$confdir = '/etc/puppetlabs/puppetdb/conf.d'If I stop using master, I won't send new PRs ;-) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
...rather than the custom logic that was used previously. Using a uniform canon fact across all modules that need to differentiate between PE and POSS makes unusual situations (such as having a missing /opt/puppet/pe_version file) more, well, uniform.