diff options
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/dsl/chef_provisioning.rb | 57 | ||||
| -rw-r--r-- | lib/chef/dsl/resources.rb | 8 |
2 files changed, 3 insertions, 62 deletions
diff --git a/lib/chef/dsl/chef_provisioning.rb b/lib/chef/dsl/chef_provisioning.rb deleted file mode 100644 index a91d297d02..0000000000 --- a/lib/chef/dsl/chef_provisioning.rb +++ /dev/null @@ -1,57 +0,0 @@ -# -# Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2015-2016, Chef Software 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. -# - -class Chef - module DSL - # Lazy activation for the chef-provisioning gem. Specifically, we set up methods for - # each resource and DSL method in chef-provisioning which, when invoked, will - # require 'chef-provisioning' (which will define the actual method) and then call the - # method chef-provisioning defined. - module ChefProvisioning - %w{ - add_machine_options - current_image_options - current_machine_options - load_balancer - machine_batch - machine_execute - machine_file - machine_image - machine - with_driver - with_image_options - with_machine_options - }.each do |method_name| - eval(<<-EOM, binding, __FILE__, __LINE__ + 1) - def #{method_name}(*args, &block) - Chef::DSL::ChefProvisioning.load_chef_provisioning - self.#{method_name}(*args, &block) - end - EOM - end - - def self.load_chef_provisioning - # Remove all chef-provisioning methods; they will be added back in by chef-provisioning - public_instance_methods(false).each do |method_name| - remove_method(method_name) - end - require "chef/provisioning" - end - end - end -end diff --git a/lib/chef/dsl/resources.rb b/lib/chef/dsl/resources.rb index 638e626ae2..9010edc5f7 100644 --- a/lib/chef/dsl/resources.rb +++ b/lib/chef/dsl/resources.rb @@ -1,6 +1,6 @@ # # Author:: John Keiser <jkeiser@chef.io> -# Copyright:: Copyright 2015-2017, Chef Software Inc. +# Copyright:: Copyright 2015-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,7 +16,6 @@ # limitations under the License. require "chef/dsl/cheffish" -require "chef/dsl/chef_provisioning" class Chef module DSL @@ -27,10 +26,9 @@ class Chef # # @api private module Resources - # Include the lazy loaders for cheffish and chef-provisioning, so that the - # resource DSL is there but the gems aren't activated yet. + # Include the lazy loader for cheffish, so that the + # resource DSL is there but the gem isn't activated yet. include Chef::DSL::Cheffish - include Chef::DSL::ChefProvisioning def self.add_resource_dsl(dsl_name) module_eval(<<-EOM, __FILE__, __LINE__ + 1) |