Add support for Critical Plugins #1064
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
coderanger
reviewed
Oct 3, 2017
lib/ohai/plugins/linux/filesystem.rb
Outdated
| @@ -92,6 +92,7 @@ def generate_mountpoint_view(fs) | |||
| end | |||
|
|
|||
| collect_data(:linux) do | |||
| fail "i iz failing" | |||
lib/ohai/system.rb
Outdated
| @@ -107,6 +108,21 @@ def run_plugins(safe = false, attribute_filter = nil) | |||
| Ohai::Log.error("Encountered error while running plugins: #{e.inspect}") | |||
| raise | |||
| end | |||
| critical_failed = [] | |||
| @runner.failed_plugins.each do |failed| | |||
| if Ohai::Config.ohai[:critical_plugins].include?(failed) | |||
There was a problem hiding this comment.
You can use a set intersection to do this, critical_failed = Ohai::Config.ohai[:critical_plugins] & @runner.failed_plugins.
jaymzh
force-pushed
the
critical_plugins
branch
2 times, most recently
from
1449e61
to
4eb6f21
Compare
danielsdeleo
reviewed
Oct 3, 2017
lib/ohai/system.rb
Outdated
| Ohai::Log.error(msg) | ||
| exit | ||
| else | ||
| fail "#{msg}. Failing Chef run." |
There was a problem hiding this comment.
should have a specific exception class
lib/ohai/plugins/linux/filesystem.rb
Outdated
| @@ -92,6 +92,7 @@ def generate_mountpoint_view(fs) | |||
| end | |||
|
|
|||
| collect_data(:linux) do | |||
| fail "i iz failing" | |||
There was a problem hiding this comment.
let's remember to remove this before merging 😄
|
I like this feature. Would be worth thinking about adding some plugins to the list by default for Chef 14 |
jaymzh
force-pushed
the
critical_plugins
branch
2 times, most recently
from
440168c
to
34e6a65
Compare
|
OK, review comments, now failing with a unique exception, and a test. |
4 tasks
jaymzh
force-pushed
the
critical_plugins
branch
from
34e6a65
to
a05740d
Compare
|
Updated message for @tas50 |
|
come on Travis, you can do it! |
jaymzh
force-pushed
the
critical_plugins
branch
from
a05740d
to
1b139f3
Compare
|
Travis seems better, so updating this PR with a RELEASE_NOTES.md update to kick travis. |
This adds a new Ohai configuration `critical_plugins` which will cause Ohai to exit (or `fail` if inside of Chef) if the plugins in the list do not run successfully. This feature only supports Ohai 7-style named plugins, not the ancient Ohai 6-style stuff. Tests to follow, but: ``` $ cat /home/phild/ohai.rb ohai.critical_plugins << :Filesystem $ ./bin/ohai -c /home/phild/ohai.rb [2017-10-03T13:43:14-07:00] INFO: The plugin path /etc/chef/ohai/plugins does not exist. Skipping... [2017-10-03T13:43:14-07:00] ERROR: The following plugins marked as critical failed: [:Filesystem] ``` And when I run Chef: ``` [2017-10-03T13:44:11-07:00] FATAL: RuntimeError: The following plugins marked as critical failed: [:Filesystem2]. Failing Chef run. ``` This fixes chef#879. Signed-off-by: Phil Dibowitz <phil@ipom.com>
jaymzh
force-pushed
the
critical_plugins
branch
from
1b139f3
to
66794cd
Compare
|
Fixing lint |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
This adds a new Ohai configuration
critical_pluginswhich will causeOhai to exit (or
failif inside of Chef) if the plugins in the list donot run successfully.
This feature only supports Ohai 7-style named plugins, not the ancient
Ohai 6-style stuff.
Tests to follow, but:
And when I run Chef:
Issues Resolved
This fixes #879.
Check List