fixes #5486 prefix and candlepin url incorrect for rhsm template on dev... #13
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
| @@ -1,5 +1,5 @@ | |||
| # Katello specific certs settings | |||
| class certs::katello { | |||
| class certs::katello ($hostname = $fqdn, $deployment_url = nil){ | |||
There was a problem hiding this comment.
Use undef instead of nil for puppet.
| PREFIX=/<%=scope.lookupvar("katello::params::deployment_url")%>/api | ||
|
|
||
| DEPLOYMENT_URL=<%= @deployment_url %> | ||
| PREFIX=/$DEPLOYMENT_URL/api |
There was a problem hiding this comment.
Won't this end up with //katello ?
There was a problem hiding this comment.
@ehelms passing katello in for the @deployment_url, the prefix gets set as
PREFIX=/katello/api
There was a problem hiding this comment.
@dustint-rh sounds like we need to update this line https://github.com/Katello/puppet-katello/blob/master/manifests/params.pp#L12 as part of your puppet-katello PR then.
There was a problem hiding this comment.
@ehelms made the change. sorry, I think I understand you now.
Fixes an issues where katello_devel module doesn't populated the prefix and candlepin url for rhsm templates correctly. This is because katello:params isn't available from puppet-katello_devel. * bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1092474
|
ACK and merging, @dustint-rh thanks! |
ehelms
added a commit
that referenced
this pull request
May 15, 2014
fixes #5486 prefix and candlepin url incorrect for rhsm template on dev...
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.
... install