chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/lib/chef/provider/ifconfig.rb

@@ -39,6 +39,15 @@ class Chef
     class Ifconfig < Chef::Provider
       include Chef::Mixin::Command
 
+      attr_accessor :config_template
+      attr_accessor :config_path
+
+      def initialize(new_resource, run_context)
+        super(new_resource, run_context)
+        @config_template = nil
+        @config_path = nil
+      end
+
       def whyrun_supported?
         true
       end
@@ -163,50 +172,31 @@ class Chef
         end
       end
 
+      def can_generate_config?
+        ! @config_template.nil? and ! @config_path.nil?
+      end
+
       def generate_config
+        return unless can_generate_config?
         b = binding
-        case node[:platform]
-        when "centos","redhat","fedora"
-          content = %{
-<% if @new_resource.device %>DEVICE=<%= @new_resource.device %><% end %>
-<% if @new_resource.onboot %>ONBOOT=<%= @new_resource.onboot %><% end %>
-<% if @new_resource.bootproto %>BOOTPROTO=<%= @new_resource.bootproto %><% end %>
-<% if @new_resource.target %>IPADDR=<%= @new_resource.target %><% end %>
-<% if @new_resource.mask %>NETMASK=<%= @new_resource.mask %><% end %>
-<% if @new_resource.network %>NETWORK=<%= @new_resource.network %><% end %>
-<% if @new_resource.bcast %>BROADCAST=<%= @new_resource.bcast %><% end %>
-<% if @new_resource.onparent %>ONPARENT=<%= @new_resource.onparent %><% end %>
-          }
-          template = ::ERB.new(content)
-          network_file_name = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
-          converge_by ("generate configuration file : #{network_file_name}") do
-            network_file = ::File.new(network_file_name, "w")
-            network_file.puts(template.result(b))
-            network_file.close
-          end
-          Chef::Log.info("#{@new_resource} created configuration file")
-        when "debian","ubuntu"
-          # template
-        when "slackware"
-          # template
+        template = ::ERB.new(@config_template)
+        converge_by ("generate configuration file : #{@config_path}") do
+          network_file = ::File.new(@config_path, "w")
+          network_file.puts(template.result(b))
+          network_file.close
         end
+        Chef::Log.info("#{@new_resource} created configuration file")
       end
 
       def delete_config
+        return unless can_generate_config?
         require 'fileutils'
-        case node[:platform]
-        when "centos","redhat","fedora"
-          ifcfg_file = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
-          if ::File.exist?(ifcfg_file)
-            converge_by ("delete the #{ifcfg_file}") do
-              FileUtils.rm_f(ifcfg_file, :verbose => false)
-            end
+        if ::File.exist?(@config_path)
+          converge_by ("delete the #{@config_path}") do
+            FileUtils.rm_f(@config_path, :verbose => false)
           end
-        when "debian","ubuntu"
-          # delete configs
-        when "slackware"
-          # delete configs
         end
+        Chef::Log.info("#{@new_resource} deleted configuration file")
       end
 
     end

data/lib/chef/provider/ifconfig/debian.rb

@@ -0,0 +1,71 @@
+#
+# Author:: Xabier de Zuazo (xabier@onddo.com)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# 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/ifconfig'
+require 'chef/util/file_edit'
+
+class Chef
+  class Provider
+    class Ifconfig
+      class Debian < Chef::Provider::Ifconfig
+
+        def initialize(new_resource, run_context)
+          super(new_resource, run_context)
+          @config_template = %{
+<% if @new_resource.device %>
+<% if @new_resource.onboot == "yes" %>auto <%= @new_resource.device %><% end %>
+<% case @new_resource.bootproto
+   when "dhcp" %>
+iface <%= @new_resource.device %> inet dhcp
+<% when "bootp" %>
+iface <%= @new_resource.device %> inet bootp
+<% else %>
+iface <%= @new_resource.device %> inet static
+    <% if @new_resource.target %>address <%= @new_resource.target %><% end %>
+    <% if @new_resource.mask %>netmask <%= @new_resource.mask %><% end %>
+    <% if @new_resource.network %>network <%= @new_resource.network %><% end %>
+    <% if @new_resource.bcast %>broadcast <%= @new_resource.bcast %><% end %>
+    <% if @new_resource.metric %>metric <%= @new_resource.metric %><% end %>
+    <% if @new_resource.hwaddr %>hwaddress <%= @new_resource.hwaddr %><% end %>
+    <% if @new_resource.mtu %>mtu <%= @new_resource.mtu %><% end %>
+<% end %>
+<% end %>
+          }
+          @config_path = "/etc/network/interfaces.d/ifcfg-#{@new_resource.device}"
+        end
+
+        def generate_config
+          check_interfaces_config
+          super
+        end
+
+        protected
+
+        def check_interfaces_config
+          converge_by ('modify configuration file : /etc/network/interfaces') do
+            Dir.mkdir('/etc/network/interfaces.d') unless ::File.directory?('/etc/network/interfaces.d')
+            conf = Chef::Util::FileEdit.new('/etc/network/interfaces')
+            conf.insert_line_if_no_match('^\s*source\s+/etc/network/interfaces[.]d/[*]\s*$', 'source /etc/network/interfaces.d/*')
+            conf.write_file
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/provider/ifconfig/redhat.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Xabier de Zuazo (xabier@onddo.com)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# 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/ifconfig'
+
+class Chef
+  class Provider
+    class Ifconfig
+      class Redhat < Chef::Provider::Ifconfig
+
+        def initialize(new_resource, run_context)
+          super(new_resource, run_context)
+          @config_template = %{
+<% if @new_resource.device %>DEVICE=<%= @new_resource.device %><% end %>
+<% if @new_resource.onboot == "yes" %>ONBOOT=<%= @new_resource.onboot %><% end %>
+<% if @new_resource.bootproto %>BOOTPROTO=<%= @new_resource.bootproto %><% end %>
+<% if @new_resource.target %>IPADDR=<%= @new_resource.target %><% end %>
+<% if @new_resource.mask %>NETMASK=<%= @new_resource.mask %><% end %>
+<% if @new_resource.network %>NETWORK=<%= @new_resource.network %><% end %>
+<% if @new_resource.bcast %>BROADCAST=<%= @new_resource.bcast %><% end %>
+<% if @new_resource.onparent %>ONPARENT=<%= @new_resource.onparent %><% end %>
+<% if @new_resource.hwaddr %>HWADDR=<%= @new_resource.hwaddr %><% end %>
+<% if @new_resource.metric %>METRIC=<%= @new_resource.metric %><% end %>
+<% if @new_resource.mtu %>MTU=<%= @new_resource.mtu %><% end %>
+          }
+          @config_path = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/provider/link.rb

@@ -27,6 +27,8 @@ require 'chef/scan_access_control'
 class Chef
   class Provider
     class Link < Chef::Provider
+
+      include Chef::Mixin::EnforceOwnershipAndPermissions
       include Chef::Mixin::ShellOut
       include Chef::Mixin::FileClass
 
@@ -110,21 +112,28 @@ class Chef
         end
         if @new_resource.link_type == :symbolic
           if access_controls.requires_changes?
-            converge_by(access_controls.describe_changes) do 
+            converge_by(access_controls.describe_changes) do
               access_controls.set_all
             end
           end
-       end
+        end
       end
 
       def action_delete
         if @current_resource.to # Exists
-          converge_by ("delete link at #{@new_resource.target_file}") do
+          converge_by("delete link at #{@new_resource.target_file}") do
             ::File.delete(@new_resource.target_file)
             Chef::Log.info("#{@new_resource} deleted")
           end
         end
       end
+
+      # Implementation components *should not* follow symlinks when managing
+      # access control (e.g., use lchmod instead of chmod) if the resource is a
+      # symlink.
+      def manage_symlink_access?
+        @new_resource.link_type == :symbolic
+      end
     end
   end
 end

data/lib/chef/provider/lwrp_base.rb

@@ -0,0 +1,150 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2008-2012 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'
+
+class Chef
+  class Provider
+
+    # == Chef::Provider::LWRPBase
+    # Base class from which LWRP providers inherit.
+    class LWRPBase < Provider
+
+      # Chef::Provider::LWRPBase::InlineResources
+      # Implementation of inline resource convergence for LWRP providers. See
+      # Provider::LWRPBase.use_inline_resources for a longer explanation.
+      #
+      # This code is restricted to a module so that it can be selectively
+      # applied to providers on an opt-in basis.
+      module InlineResources
+
+        # Class methods for InlineResources. Overrides the `action` DSL method
+        # with one that enables inline resource convergence.
+        module ClassMethods
+          # Defines an action method on the provider, using
+          # recipe_eval_with_update_check to execute the given block.
+          def action(name, &block)
+            define_method("action_#{name}") do
+              recipe_eval_with_update_check(&block)
+            end
+          end
+        end
+
+        # Executes the given block in a temporary run_context with its own
+        # resource collection. After the block is executed, any resources
+        # declared inside are converged, and if any are updated, the
+        # new_resource will be marked updated.
+        def recipe_eval_with_update_check(&block)
+          saved_run_context = @run_context
+          temp_run_context = @run_context.dup
+          @run_context = temp_run_context
+          @run_context.resource_collection = Chef::ResourceCollection.new
+
+          return_value = instance_eval(&block)
+          Chef::Runner.new(@run_context).converge
+          return_value
+        ensure
+          @run_context = saved_run_context
+          if temp_run_context.resource_collection.any? {|r| r.updated? }
+            new_resource.updated_by_last_action(true)
+          end
+        end
+
+      end
+
+      extend Chef::Mixin::ConvertToClassName
+      extend Chef::Mixin::FromFile
+
+      include Chef::DSL::Recipe
+
+      # These were previously provided by Chef::Mixin::RecipeDefinitionDSLCore.
+      # They are not included by its replacment, Chef::DSL::Recipe, but
+      # they may be used in existing LWRPs.
+      include Chef::DSL::PlatformIntrospection
+      include Chef::DSL::DataQuery
+
+      def self.build_from_file(cookbook_name, filename, run_context)
+        provider_name = filename_to_qualified_string(cookbook_name, filename)
+
+        # Add log entry if we override an existing light-weight provider.
+        class_name = convert_to_class_name(provider_name)
+
+        if Chef::Provider.const_defined?(class_name)
+          Chef::Log.info("#{class_name} light-weight provider already initialized -- overriding!")
+        end
+
+        provider_class = Class.new(self)
+        provider_class.class_from_file(filename)
+
+        class_name = convert_to_class_name(provider_name)
+        Chef::Provider.const_set(class_name, provider_class)
+        Chef::Log.debug("Loaded contents of #{filename} into a provider named #{provider_name} defined in Chef::Provider::#{class_name}")
+
+        provider_class
+      end
+
+      # Enables inline evaluation of resources in provider actions.
+      #
+      # Without this option, any resources declared inside the LWRP are added
+      # to the resource collection after the current position at the time the
+      # action is executed. Because they are added to the primary resource
+      # collection for the chef run, they can notify other resources outside
+      # the LWRP, and potentially be notified by resources outside the LWRP
+      # (but this is complicated by the fact that they don't exist until the
+      # provider executes). In this mode, it is impossible to correctly set the
+      # updated_by_last_action flag on the parent LWRP resource, since it
+      # executes and returns before its component resources are run.
+      #
+      # With this option enabled, each action creates a temporary run_context
+      # with its own resource collection, evaluates the action's code in that
+      # context, and then converges the resources created. If any resources
+      # were updated, then this provider's new_resource will be marked updated.
+      #
+      # In this mode, resources created within the LWRP cannot interact with
+      # external resources via notifies, though notifications to other
+      # resources within the LWRP will work. Delayed notifications are executed
+      # at the conclusion of the provider's action, *not* at the end of the
+      # main chef run.
+      #
+      # This mode of evaluation is experimental, but is believed to be a better
+      # set of tradeoffs than the append-after mode, so it will likely become
+      # the default in a future major release of Chef.
+      #
+      def self.use_inline_resources
+        extend InlineResources::ClassMethods
+        include InlineResources
+      end
+
+      # DSL for defining a provider's actions.
+      def self.action(name, &block)
+        define_method("action_#{name}") do
+          instance_eval(&block)
+        end
+      end
+
+      # no-op `load_current_resource`. Allows simple LWRP providers to work
+      # without defining this method explicitly (silences
+      # Chef::Exceptions::Override exception)
+      def load_current_resource
+      end
+
+    end
+  end
+end

data/lib/chef/provider/mount.rb

@@ -79,7 +79,7 @@ class Chef
       end
 
       def action_enable
-        unless @current_resource.enabled
+        unless @current_resource.enabled && mount_options_unchanged?
           converge_by("remount #{@current_resource.device}") do 
             status = enable_fs
             if status

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

@@ -44,7 +44,7 @@ class Chef
           # only check for existence of non-remote devices
           if (device_should_exist? && !::File.exists?(device_real) )
             raise Chef::Exceptions::Mount, "Device #{@new_resource.device} does not exist"
-          elsif( !::File.exists?(@new_resource.mount_point) )
+          elsif( @new_resource.mount_point != "none" && !::File.exists?(@new_resource.mount_point) )
             raise Chef::Exceptions::Mount, "Mount point #{@new_resource.mount_point} does not exist"
           end
           return true
@@ -177,7 +177,8 @@ class Chef
         end
 
         def device_should_exist?
-          ( not network_device? ) &&
+          ( @new_resource.device != "none" ) && 
+            ( not network_device? ) &&
             ( not %w[ tmpfs fuse ].include? @new_resource.fstype )
         end
 
@@ -225,7 +226,11 @@ class Chef
             # ignore trailing slash
             Regexp.escape(device_real)+"/?"
           elsif ::File.symlink?(device_real)
-            "(?:#{Regexp.escape(device_real)})|(?:#{Regexp.escape(::File.readlink(device_real))})"
+            # This regular expression tries to match device_real. If that does not match it will try to match the target of device_real.
+            # So given a symlink like this:
+            # /dev/mapper/vgroot-tmp.vol -> /dev/dm-9
+            # First it will try to match "/dev/mapper/vgroot-tmp.vol". If there is no match it will try matching for "/dev/dm-9".
+            "(?:#{Regexp.escape(device_real)}|#{Regexp.escape(::File.readlink(device_real))})"
           else
             Regexp.escape(device_real)
           end

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

@@ -59,7 +59,10 @@ class Chef
 
         def mount_fs
           unless @current_resource.mounted
-            @mount.add(@new_resource.device)
+            @mount.add(:remote => @new_resource.device,
+                       :username => @new_resource.username,
+                       :domainname => @new_resource.domain,
+                       :password => @new_resource.password)
             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}")