Add ability to configure custom_trusted_oid_mapping.yaml #603
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
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
ekohl
requested changes
Jun 25, 2018
manifests/init.pp
Outdated
| @@ -182,7 +182,7 @@ | |||
| # $environment:: Default environment of the Puppet agent | |||
| # | |||
| # $agent_additional_settings:: A hash of additional agent settings. | |||
| # Example: {stringify_facts => true} | |||
| # Example: {stringify_facts => true} | |||
There was a problem hiding this comment.
Could you revert this change and other whitespace only changes?
There was a problem hiding this comment.
Done! Sorry! :/ Are the whitespace changes in server.pp ok?
types/custom_trusted_oid_mapping.pp
Outdated
| @@ -0,0 +1,4 @@ | |||
| type Puppet::Custom_trusted_oid_mapping = Hash[String, Struct[{ | |||
There was a problem hiding this comment.
We have a bug in our installer that it currently doesn't handle multi line types because it does incorrect manual parsing. We should be fixing it but in the short term I wonder if we should put it on a single line.
| end | ||
|
|
||
| it 'should have a configured custom_trusted_oid_mapping.yaml' do | ||
| should contain_file("#{confdir}/custom_trusted_oid_mapping.yaml"). |
There was a problem hiding this comment.
We have a verify_exact_contents helper which might be easier to use.
There was a problem hiding this comment.
This is really helpful, thanks! :)
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This commit adds support to configure the $confdir/custom_trusted_oid_mapping.yaml as described in https://puppet.com/docs/puppet/5.5/config_file_oid_map.html. Fixes theforemanGH-602.
This comment has been minimized.
This comment has been minimized.
baurmatt
force-pushed
the
feature/manage_custom_trusted_oid_mapping.yaml
branch
from
225171c to
7acde39
Compare
This comment has been minimized.
This comment has been minimized.
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
Fixed review comments, thanks! :) |
ekohl
approved these changes
Sep 12, 2018
|
Thanks! |
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.
This commit adds support to configure the
$confdir/custom_trusted_oid_mapping.yaml as described in
https://puppet.com/docs/puppet/5.5/config_file_oid_map.html.
Fixes GH-602