chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/lib/chef/provider/log.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@ class Chef
         def load_current_resource
           true
         end
-      
+
         # Write the log to Chef's log
         #
         # === Return

data/lib/chef/provider/mdadm.rb

@@ -47,8 +47,9 @@ class Chef
 
       def action_create
         unless @current_resource.exists
-          converge_by("create RAID device #{new_resource.raid_device}") do 
-            command = "yes | mdadm --create #{@new_resource.raid_device} --chunk=#{@new_resource.chunk} --level #{@new_resource.level}"
+          converge_by("create RAID device #{new_resource.raid_device}") do
+            command = "yes | mdadm --create #{@new_resource.raid_device} --level #{@new_resource.level}"
+            command << " --chunk=#{@new_resource.chunk}" unless @new_resource.level == 1
             command << " --metadata=#{@new_resource.metadata}"
             command << " --bitmap=#{@new_resource.bitmap}" if @new_resource.bitmap
             command << " --raid-devices #{@new_resource.devices.length} #{@new_resource.devices.join(" ")}"
@@ -63,7 +64,7 @@ class Chef
 
       def action_assemble
         unless @current_resource.exists
-          converge_by("assemble RAID device #{new_resource.raid_device}") do 
+          converge_by("assemble RAID device #{new_resource.raid_device}") do
             command = "yes | mdadm --assemble #{@new_resource.raid_device} #{@new_resource.devices.join(" ")}"
             Chef::Log.debug("#{@new_resource} mdadm command: #{command}")
             shell_out!(command)
@@ -76,7 +77,7 @@ class Chef
 
       def action_stop
         if @current_resource.exists
-          converge_by("stop RAID device #{new_resource.raid_device}") do 
+          converge_by("stop RAID device #{new_resource.raid_device}") do
             command = "yes | mdadm --stop #{@new_resource.raid_device}"
             Chef::Log.debug("#{@new_resource} mdadm command: #{command}")
             shell_out!(command)

data/lib/chef/provider/mount.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@ class Chef
 
       def action_mount
         unless @current_resource.mounted
-          converge_by("mount #{@current_resource.device} to #{@current_resource.mount_point}") do 
+          converge_by("mount #{@current_resource.device} to #{@current_resource.mount_point}") do
             status = mount_fs()
             if status
               Chef::Log.info("#{@new_resource} mounted")
@@ -50,7 +50,7 @@ class Chef
 
       def action_umount
         if @current_resource.mounted
-          converge_by("unmount #{@current_resource.device}") do 
+          converge_by("unmount #{@current_resource.device}") do
             status = umount_fs()
             if status
               Chef::Log.info("#{@new_resource} unmounted")
@@ -66,7 +66,7 @@ class Chef
           raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :remount"
         else
           if @current_resource.mounted
-            converge_by("remount #{@current_resource.device}") do 
+            converge_by("remount #{@current_resource.device}") do
               status = remount_fs()
               if status
                 Chef::Log.info("#{@new_resource} remounted")
@@ -80,7 +80,7 @@ class Chef
 
       def action_enable
         unless @current_resource.enabled && mount_options_unchanged?
-          converge_by("remount #{@current_resource.device}") do 
+          converge_by("remount #{@current_resource.device}") do
             status = enable_fs
             if status
               Chef::Log.info("#{@new_resource} enabled")
@@ -93,7 +93,7 @@ class Chef
 
       def action_disable
         if @current_resource.enabled
-          converge_by("remount #{@current_resource.device}") do 
+          converge_by("remount #{@current_resource.device}") do
             status = disable_fs
             if status
               Chef::Log.info("#{@new_resource} disabled")
@@ -115,14 +115,14 @@ class Chef
       def remount_fs
         raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :remount"
       end
-      
+
       def enable_fs
-        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :enable"        
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :enable"
       end
-      
+
       def disable_fs
-        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :disable"        
-      end      
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :disable"
+      end
     end
   end
 end

data/lib/chef/provider/mount/aix.rb

@@ -0,0 +1,179 @@
+#
+# Author::
+# Copyright:: Copyright (c) 2009 Opscode, Inc
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/provider/mount'
+
+class Chef
+  class Provider
+    class Mount
+      class Aix < Chef::Provider::Mount::Mount
+
+        # Override for aix specific handling
+        def initialize(new_resource, run_context)
+          super
+          # options and fstype are set to "defaults" and "auto" respectively in the Mount Resource class. These options are not valid for AIX, override them.
+          if @new_resource.options[0] == "defaults"
+            @new_resource.options.clear
+          end
+          if @new_resource.fstype == "auto"
+            @new_resource.fstype = nil
+          end
+        end
+
+        def enabled?
+          # Check to see if there is an entry in /etc/filesystems. Last entry for a volume wins. Using command "lsfs" to fetch entries.
+          enabled = false
+
+          # lsfs o/p = #MountPoint:Device:Vfs:Nodename:Type:Size:Options:AutoMount:Acct
+          # search only for current mount point
+          shell_out("lsfs -c #{@new_resource.mount_point}").stdout.each_line do | line |
+            case line
+            when /^#\s/
+              next
+            when /^#{Regexp.escape(@new_resource.mount_point)}:#{device_fstab_regex}:(\S+):(\[\S+\])?:(\S+)?:(\S+):(\S+):(\S+):(\S+)/
+              # mount point entry with ipv6 address for nodename (ipv6 address use ':')
+              enabled = true
+              @current_resource.fstype($1)
+              @current_resource.options($5)
+              Chef::Log.debug("Found mount #{device_fstab} to #{@new_resource.mount_point} in /etc/filesystems")
+              next
+            when /^#{Regexp.escape(@new_resource.mount_point)}:#{device_fstab_regex}::(\S+):(\S+)?:(\S+)?:(\S+):(\S+):(\S+):(\S+)/
+              # mount point entry with hostname or ipv4 address
+              enabled = true
+              @current_resource.fstype($1)
+              @current_resource.options($5)
+              Chef::Log.debug("Found mount #{device_fstab} to #{@new_resource.mount_point} in /etc/filesystems")
+              next
+            when /^#{Regexp.escape(@new_resource.mount_point)}/
+              enabled=false
+              Chef::Log.debug("Found conflicting mount point #{@new_resource.mount_point} in /etc/filesystems")
+            end
+          end
+          @current_resource.enabled(enabled)
+        end
+
+        def mounted?
+          mounted = false
+          shell_out!("mount").stdout.each_line do |line|
+            if network_device?
+              device_details = device_fstab.split(":")
+              search_device = device_details[1]
+            else
+              search_device = device_fstab_regex
+            end
+            case line
+            when /#{search_device}\s+#{Regexp.escape(@new_resource.mount_point)}/
+              mounted = true
+              Chef::Log.debug("Special device #{device_logstring} mounted as #{@new_resource.mount_point}")
+            when /^[\/\w]+\s+#{Regexp.escape(@new_resource.mount_point)}\s+/
+              mounted = false
+              Chef::Log.debug("Found conflicting mount point #{@new_resource.mount_point} in /etc/fstab")
+            end
+          end
+          @current_resource.mounted(mounted)
+        end
+
+        def mount_fs
+          unless @current_resource.mounted
+            mountable?
+            command = "mount -v #{@new_resource.fstype}"
+
+            if !(@new_resource.options.nil? || @new_resource.options.empty?)
+              command << " -o #{@new_resource.options.join(',')}"
+            end
+
+            command << case @new_resource.device_type
+            when :device
+              " #{device_real}"
+            when :label
+              " -L #{@new_resource.device}"
+            when :uuid
+              " -U #{@new_resource.device}"
+            end
+            command << " #{@new_resource.mount_point}"
+            shell_out!(command)
+            Chef::Log.debug("#{@new_resource} is mounted at #{@new_resource.mount_point}")
+          else
+            Chef::Log.debug("#{@new_resource} is already mounted at #{@new_resource.mount_point}")
+          end
+        end
+
+        def remount_command
+          if !(@new_resource.options.nil? || @new_resource.options.empty?)
+            return "mount -o remount,#{@new_resource.options.join(',')} #{@new_resource.device} #{@new_resource.mount_point}"
+          else
+            return "mount -o remount #{@new_resource.device} #{@new_resource.mount_point}"
+          end
+        end
+
+        def enable_fs
+          if @current_resource.enabled && mount_options_unchanged?
+            Chef::Log.debug("#{@new_resource} is already enabled - nothing to do")
+            return nil
+          end
+
+          if @current_resource.enabled
+            # The current options don't match what we have, so
+            # disable, then enable.
+            disable_fs
+          end
+          ::File.open("/etc/filesystems", "a") do |fstab|
+            fstab.puts("#{@new_resource.mount_point}:")
+            if network_device?
+              device_details = device_fstab.split(":")
+              fstab.puts("\tdev\t\t= #{device_details[1]}")
+              fstab.puts("\tnodename\t\t= #{device_details[0]}")
+            else
+              fstab.puts("\tdev\t\t= #{device_fstab}")
+            end
+            fstab.puts("\tvfs\t\t= #{@new_resource.fstype}")
+            fstab.puts("\tmount\t\t= false")
+            fstab.puts "\toptions\t\t= #{@new_resource.options.join(',')}" unless @new_resource.options.nil? || @new_resource.options.empty?
+            Chef::Log.debug("#{@new_resource} is enabled at #{@new_resource.mount_point}")
+          end
+        end
+
+        def disable_fs
+          contents = []
+          if @current_resource.enabled
+            found_device = false
+            ::File.open("/etc/filesystems", "r").each_line do |line|
+              case line
+              when /^\/.+:\s*$/
+                if line =~ /#{Regexp.escape(@new_resource.mount_point)}+:/
+                  found_device = true
+                else
+                  found_device = false
+                end
+              end
+              if !found_device
+                contents << line
+              end
+            end
+            ::File.open("/etc/filesystems", "w") do |fstab|
+              contents.each { |line| fstab.puts line}
+            end
+          else
+            Chef::Log.debug("#{@new_resource} is not enabled - nothing to do")
+          end
+        end
+
+    end
+   end
+  end
+end

data/lib/chef/provider/mount/mount.rb

@@ -39,7 +39,7 @@ class Chef
           mounted?
           enabled?
         end
-        
+
         def mountable?
           # only check for existence of non-remote devices
           if (device_should_exist? && !::File.exists?(device_real) )
@@ -49,7 +49,7 @@ class Chef
           end
           return true
         end
-        
+
         def enabled?
           # Check to see if there is a entry in /etc/fstab. Last entry for a volume wins.
           enabled = false
@@ -72,17 +72,27 @@ class Chef
           end
           @current_resource.enabled(enabled)
         end
-        
+
         def mounted?
           mounted = false
+
+          # "mount" outputs the mount points as real paths. Convert
+          # the mount_point of the resource to a real path in case it
+          # contains symlinks in its parents dirs.
+          real_mount_point = if ::File.exists? @new_resource.mount_point
+                               ::File.realpath(@new_resource.mount_point)
+                             else
+                               @new_resource.mount_point
+                             end
+
           shell_out!("mount").stdout.each_line do |line|
             case line
-            when /^#{device_mount_regex}\s+on\s+#{Regexp.escape(@new_resource.mount_point)}/
+            when /^#{device_mount_regex}\s+on\s+#{Regexp.escape(real_mount_point)}/
               mounted = true
-              Chef::Log.debug("Special device #{device_logstring} mounted as #{@new_resource.mount_point}")
-            when /^([\/\w])+\son\s#{Regexp.escape(@new_resource.mount_point)}\s+/
+              Chef::Log.debug("Special device #{device_logstring} mounted as #{real_mount_point}")
+            when /^([\/\w])+\son\s#{Regexp.escape(real_mount_point)}\s+/
               mounted = false
-              Chef::Log.debug("Special device #{$~[1]} mounted as #{@new_resource.mount_point}")
+              Chef::Log.debug("Special device #{$~[1]} mounted as #{real_mount_point}")
             end
           end
           @current_resource.mounted(mounted)
@@ -118,9 +128,13 @@ class Chef
           end
         end
 
+        def remount_command
+           return "mount -o remount #{@new_resource.mount_point}"
+        end
+
         def remount_fs
           if @current_resource.mounted and @new_resource.supports[:remount]
-            shell_out!("mount -o remount #{@new_resource.mount_point}")
+            shell_out!(remount_command)
             @new_resource.updated_by_last_action(true)
             Chef::Log.debug("#{@new_resource} is remounted at #{@new_resource.mount_point}")
           elsif @current_resource.mounted
@@ -137,7 +151,7 @@ class Chef
             Chef::Log.debug("#{@new_resource} is already enabled - nothing to do")
             return nil
           end
-          
+
           if @current_resource.enabled
             # The current options don't match what we have, so
             # disable, then enable.
@@ -152,7 +166,7 @@ class Chef
         def disable_fs
           if @current_resource.enabled
             contents = []
-            
+
             found = false
             ::File.readlines("/etc/fstab").reverse_each do |line|
               if !found && line =~ /^#{device_fstab_regex}\s+#{Regexp.escape(@new_resource.mount_point)}/
@@ -163,7 +177,7 @@ class Chef
                 contents << line
               end
             end
-            
+
             ::File.open("/etc/fstab", "w") do |fstab|
               contents.reverse_each { |line| fstab.puts line}
             end
@@ -177,7 +191,7 @@ class Chef
         end
 
         def device_should_exist?
-          ( @new_resource.device != "none" ) && 
+          ( @new_resource.device != "none" ) &&
             ( not network_device? ) &&
             ( not %w[ tmpfs fuse ].include? @new_resource.fstype )
         end
@@ -196,7 +210,7 @@ class Chef
         end
 
         def device_real
-          if @real_device == nil 
+          if @real_device == nil
             if @new_resource.device_type == :device
               @real_device = @new_resource.device
             else
@@ -243,14 +257,14 @@ class Chef
             device_fstab
           end
         end
-        
+
         def mount_options_unchanged?
           @current_resource.fstype == @new_resource.fstype and
           @current_resource.options == @new_resource.options and
           @current_resource.dump == @new_resource.dump and
           @current_resource.pass == @new_resource.pass
         end
-        
+
       end
     end
   end

data/lib/chef/provider/package.rb

@@ -50,7 +50,7 @@ class Chef
 
         requirements.assert(:upgrade) do |a|
           # Can't upgrade what we don't have
-          a.assertion  { !(@current_resource.version.nil? && candidate_version.nil?) } 
+          a.assertion  { !(@current_resource.version.nil? && candidate_version.nil?) }
           a.failure_message(Chef::Exceptions::Package, "No candidate version available for #{@new_resource.package_name}")
           a.whyrun("Assuming a repository that offers #{@new_resource.package_name} would have been configured")
         end
@@ -71,9 +71,9 @@ class Chef
         # We need to make sure we handle the preseed file
         if @new_resource.response_file
           if preseed_file = get_preseed_file(@new_resource.package_name, install_version)
-            converge_by("preseed package #{@new_resource.package_name}") do  
+            converge_by("preseed package #{@new_resource.package_name}") do
               preseed_package(preseed_file)
-            end 
+            end
           end
         end
         description = install_version ? "version #{install_version} of" : ""
@@ -92,7 +92,7 @@ class Chef
           @new_resource.version(candidate_version)
           orig_version = @current_resource.version || "uninstalled"
           converge_by("upgrade package #{@new_resource.package_name} from #{orig_version} to #{candidate_version}") do
-            status = upgrade_package(@new_resource.package_name, candidate_version)
+            upgrade_package(@new_resource.package_name, candidate_version)
             Chef::Log.info("#{@new_resource} upgraded from #{orig_version} to #{candidate_version}")
           end
         end
@@ -146,7 +146,7 @@ class Chef
         if preseed_file = get_preseed_file(@new_resource.package_name, @current_resource.version)
           converge_by("reconfigure package #{@new_resource.package_name}") do
             preseed_package(preseed_file)
-            status = reconfig_package(@new_resource.package_name, @current_resource.version)
+            reconfig_package(@new_resource.package_name, @current_resource.version)
             Chef::Log.info("#{@new_resource} reconfigured")
           end
         else
@@ -198,21 +198,21 @@ class Chef
 
         Chef::Log.debug("#{@new_resource} fetching preseed file to #{cache_seed_to}")
 
-        begin
+
+        if template_available?(@new_resource.response_file)
+          Chef::Log.debug("#{@new_resource} fetching preseed file via Template")
           remote_file = Chef::Resource::Template.new(cache_seed_to, run_context)
-          remote_file.cookbook_name = @new_resource.cookbook_name
-          remote_file.source(@new_resource.response_file)
-          remote_file.backup(false)
-          provider = Chef::Platform.provider_for_resource(remote_file, :create)
-          provider.template_location
-        rescue
-          Chef::Log.debug("#{@new_resource} fetching preseed file via Template resource failed, fallback to CookbookFile resource")
+        elsif cookbook_file_available?(@new_resource.response_file)
+          Chef::Log.debug("#{@new_resource} fetching preseed file via cookbook_file")
           remote_file = Chef::Resource::CookbookFile.new(cache_seed_to, run_context)
-          remote_file.cookbook_name = @new_resource.cookbook_name
-          remote_file.source(@new_resource.response_file)
-          remote_file.backup(false)
+        else
+          message = "No template or cookbook file found for response file #{@new_resource.response_file}"
+          raise Chef::Exceptions::FileNotFound, message
         end
 
+        remote_file.cookbook_name = @new_resource.cookbook_name
+        remote_file.source(@new_resource.response_file)
+        remote_file.backup(false)
         remote_file
       end
 
@@ -224,6 +224,16 @@ class Chef
         @new_resource.version == @current_resource.version
       end
 
+      private
+
+      def template_available?(path)
+        run_context.has_template_in_cookbook?(@new_resource.cookbook_name, path)
+      end
+
+      def cookbook_file_available?(path)
+        run_context.has_cookbook_file_in_cookbook?(@new_resource.cookbook_name, path)
+      end
+
     end
   end
 end