Merge pull request #275 from carbonin/specify_platform_for_scap

Specify rhel7 as the scap security guide platform
ManageIQ · Oct 3, 2017 · 2f0d09f · 2f0d09f
2 parents d3a774a + 046c081
commit 2f0d09f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/gems/pending/appliance_console/scap.rb b/lib/gems/pending/appliance_console/scap.rb
@@ -12,7 +12,7 @@ def lockdown
         require 'yaml'
         scap_config = YAML.load_file(yaml_filename)
         begin
-          LinuxAdmin::Scap.new.lockdown(*scap_config['rules'], scap_config['values'])
+          LinuxAdmin::Scap.new("rhel7").lockdown(*scap_config['rules'], scap_config['values'])
         rescue => e
           say("Configuration failed: #{e.message}")
         else
@@ -31,7 +31,7 @@ def packages_installed?
       if !LinuxAdmin::Scap.openscap_available?
         say("OpenSCAP has not been installed")
         false
-      elsif !LinuxAdmin::Scap.ssg_available?
+      elsif !LinuxAdmin::Scap.ssg_available?("rhel7")
         say("SCAP Security Guide has not been installed")
         false
       else

diff --git a/manageiq-gems-pending.gemspec b/manageiq-gems-pending.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "binary_struct",           "~> 2.1"
   s.add_runtime_dependency "bundler",                 ">= 1.8.4" # rails-assets requires bundler >= 1.8.4, see: https://rails-assets.org/
   s.add_runtime_dependency "highline",                "~> 1.6.21" # Needed for the appliance_console
-  s.add_runtime_dependency "linux_admin",             "~> 0.20.2"
+  s.add_runtime_dependency "linux_admin",             "~> 1.0"
   s.add_runtime_dependency "log4r",                   "=  1.1.8"
   s.add_runtime_dependency "memoist",                 "~> 0.15.0"
   s.add_runtime_dependency "more_core_extensions",    "~> 3.4"