diff options
| author | Tim Smith <tsmith@chef.io> | 2018-11-26 21:11:55 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-11-26 21:11:55 -0800 |
| commit | e1fe9b9ef0d2823d4aedb04b1693a591540a3ea9 (patch) | |
| tree | 4ab5ea2639fac6ff179a6a43076f62f4311817af | |
| parent | 551e7d6c1c89a57026c1776da5303e77cbcd4018 (diff) | |
| download | ohai-e1fe9b9ef0d2823d4aedb04b1693a591540a3ea9.tar.gz | |
Remove nexus_centos os-release detection from the legacy method
We'll never get to this code since it requires a os-release file
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/ohai/plugins/linux/platform.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb index 8571e7f2..fb620ea7 100644 --- a/lib/ohai/plugins/linux/platform.rb +++ b/lib/ohai/plugins/linux/platform.rb @@ -211,14 +211,9 @@ Ohai.plugin(:Platform) do platform get_redhatish_platform(contents) platform_version contents.match(/(\d\.\d\.\d)/)[0] elsif File.exist?("/etc/redhat-release") - if os_release_file_is_cisco? # Cisco guestshell - platform "nexus_centos" - platform_version os_release_info["VERSION"] - else - contents = File.read("/etc/redhat-release").chomp - platform get_redhatish_platform(contents) - platform_version get_redhatish_version(contents) - end + contents = File.read("/etc/redhat-release").chomp + platform get_redhatish_platform(contents) + platform_version get_redhatish_version(contents) elsif File.exist?("/etc/system-release") contents = File.read("/etc/system-release").chomp platform get_redhatish_platform(contents) |