Deploy new PE related changes #116
Merged
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
added 4 commits
April 25, 2015 17:24
Since it's apparently not in the master's catalogue automagically
This commit also adds the pe-mcollective service which we'll want
This is so incredibly tedious.
Error: Could not retrieve catalog from remote server: Error 400 on SERVER:
Duplicate declaration: Service[pe-mcollective] is already declared in file
/etc/puppetlabs/puppet/environments/staging/dist/profile/manifests/puppetmaster.pp:71;
cannot redeclare at
/opt/puppet/share/puppet/modules/puppet_enterprise/manifests/mcollective/service.pp:6
on node jenkins-puppet.osuosl.org
Warning: Not using cache on failed catalog
Error: Could not retrieve catalog; skipping run
| @@ -17,7 +17,7 @@ | |||
| # The `pe-httpd` service resource is defined in the Puppet master catalog | |||
| # itself (due to classification in PE Console), therefore you won't find | |||
| # any declaration of that resource in this codebase | |||
| notify => Service['pe-httpd'], | |||
| notify => Service['pe-puppetserver'], | |||
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.
These changes are ostensibly required to make sure the new PE 3.7 works properly