adds the `platform_utils::pip` recipe.

[metasearch/grid-chef-repo.git] / cookbooks / platform_utils / libraries / helper.rb

diff --git a/cookbooks/platform_utils/libraries/helper.rb b/cookbooks/platform_utils/libraries/helper.rb
index cf8c770..2067d3a 100644 (file)
--- a/cookbooks/platform_utils/libraries/helper.rb
+++ b/cookbooks/platform_utils/libraries/helper.rb
@@ -26,28 +26,28 @@ module PlatformUtils
     include PlatformUtils::VirtUtils
 
     def load_kernel_module(mod_name)
-      unless container_guest_node?
-        # for old distributions.
-        dir = '/etc/modules-load.d'
-        resources(directory: dir) rescue directory dir do
-          owner 'root'
-          group 'root'
-          mode '0755'
-        end
+      return if container_guest_node?
+
+      # for old distributions.
+      dir = '/etc/modules-load.d'
+      resources(directory: dir) rescue directory dir do
+        owner 'root'
+        group 'root'
+        mode '0755'
+      end
 
-        exec_name = "load_#{mod_name}_kernel_module"
-        resources(execute: exec_name) rescue execute exec_name do
-          command "modprobe #{mod_name}"
-          not_if "lsmod | grep #{mod_name}"
-        end
+      exec_name = "load_#{mod_name}_kernel_module"
+      resources(execute: exec_name) rescue execute exec_name do
+        command "modprobe #{mod_name}"
+        not_if "lsmod | grep #{mod_name}"
+      end
 
-        file_name = "/etc/modules-load.d/#{mod_name}.conf"
-        resources(file: file_name) rescue file file_name do
-          content "#{mod_name}\n"
-          owner 'root'
-          group 'root'
-          mode '0644'
-        end
+      file_name = "/etc/modules-load.d/#{mod_name}.conf"
+      resources(file: file_name) rescue file file_name do
+        content "#{mod_name}\n"
+        owner 'root'
+        group 'root'
+        mode '0644'
       end
     end
 
@@ -55,10 +55,10 @@ module PlatformUtils
       invalid_word = words.find {|word|
         word =~ /[;\|&<>`]/
       }
-      unless invalid_word.nil?
-        Chef::Log.fatal("Command string includes the invalid character (;|&<>`): #{invalid_word}")
-        raise
-      end
+
+      return if invalid_word.nil?
+      Chef::Log.fatal("Command string includes the invalid character (;|&<>`): #{invalid_word}")
+      raise
     end
 
     def touch_subid_files