chef-metal 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae7198497aa5a5f38de02410732e0a1aab44e63a
-  data.tar.gz: bebf3d3226651b34c9bf334ac427c85d4ec6d6af
+  metadata.gz: 4f75d0eea4f0ab10f62670396310edd0576e866f
+  data.tar.gz: 6dd9f7a2319e535163b35772f1efa62b6d32bd7e
 SHA512:
-  metadata.gz: b3f43cbc60deb6bf72f4aec3dabfcb16689896f74ab3b58abcd61cf6b97801402c903f75701837d015f7aa990f470c580367782f2ba9749d3cb69d7a931d5f69
-  data.tar.gz: 4cc81e32caf611a3f518b440ea8d2c4ef7a3b9be34f04993ab59f85f68750ede2e9cfc2f0220b2675a8aaf12e13f975b9801889d54a5a33c59cea681b33e11cf
+  metadata.gz: bdb8c0681270de564b0adc840e73a382c8bef6a1aa358692e81b80b480f670d6be31c1128f87e0ce8b6774168a74d0731d3975264d7a2e7ed0b97ac13455d924
+  data.tar.gz: a58484ee3eafe1c46914fe624587c2476e16f42c9b935f7bdcae29b6e409354745a7e57884ed97fc86031174bf6344caf95096b7de0c745410bdf4fc50e7dadb

data/CHANGELOG.md

@@ -0,0 +1,29 @@
+# Chef Metal Changelog
+
+## 0.6 (4/4/2014)
+
+- Vagrant and Fog provisioners moved to their own gems (chef-metal-vagrant and chef-metal-fog)
+- Support for Hosted and Enterprise Chef (https://github.com/dafyddcrosby)
+
+## 0.5 (4/3/2014)
+
+* Provisioner interface changes designed to allow provisioners to be used outside of Chef (doubt@getchef.com)
+  * All Provisioner and Machine methods now take "action_handler" instead of "provider."  It uses the ActionHandler interface described in action_handler.rb.  In short:
+    - provider.run_context -> action_handler.recipe_context
+    - provider.updated_by_last_action(true) -> action_handler.updated!
+    - provider.converge_by -> action_handler.perform_action
+    - provider.cookbook_name -> provider.debug_name
+  * Convergence strategy: delete_chef_objects() -> cleanup_convergence()
+* Ability to get back to a machine from a node (another Provisioner interface change) (doubt@getchef.com):
+  * Provisioners must create a file named `chef_metal/provisioner_init/<scheme>_init.rb`.  It will be required when a node is encountered with that scheme.  It should call ChefMetal.add_registered_provisioner_class(<scheme>, <provisioner class name>).  For the provisioner_url `fog:AWS:21348723432`, the scheme is "fog" and the file is `chef_metalprovisioner_init/fog_init.rb`.  It should call `ChefMetal.add_registered_provisioner_class('fog', ChefMetal::Provisioner::FogProvisioner)`.
+  * Provisioner classes must implement the class method `inflate(node)`, which should create a Provisioner instance appropriate to the given `node` (generally by looking at `node['normal']['provisioner_output']`)
+* New `NoConverge` convergence strategy that creates a node but does not install Chef or converge.
+* Support for machine_file `group`, `owner` and `mode` attributes (@irvingpop)
+* SSH transport (ryan@segv.net): try to enable pty when possible (increases chance of successful connection).  Set options[:ssh_pty_enable] to `false` to turn this off.  Set `true` to force it (and fail if we can't get it)
+
+## 0.4 (3/29/2014)
+
+* EC2: Make it possible for multiple IAM users to converge chef-metal on the same account
+* Openstack: Openstack support via the Fog driver! (@cstewart87)
+* EC2: Add :use_private_ip_for_ssh option, and use private ip by default if public IP does not exist.  (@xorl, @dafyddcrosby)
+* RHEL/Centos: fix platform detection and installation

data/lib/chef_metal/convergence_strategy/precreate_chef_objects.rb

@@ -126,8 +126,22 @@ module ChefMetal
             chef_server machine_resource.chef_server
             raw_json machine.node
           end
+        end
 
+        # If using enterprise/hosted chef, fix acls
+        if machine_resource.chef_server[:chef_server_url] =~ /\/+organizations\/.+/
+          grant_client_node_permissions(machine_resource.chef_server, machine.node['name'], ["read", "update"])
+        end
+      end
 
+      # Grant the client permissions to the node
+      # This procedure assumes that the client name and node name are the same
+      def grant_client_node_permissions(chef_server, node_name, perms)
+        rest = Chef::REST.new(chef_server[:chef_server_url])
+        node_perms = rest.get("/nodes/#{node_name}/_acl")
+        perms.each do |p|
+          node_perms[p]['actors'] << node_name unless node_perms[p]['actors'].include?(node_name)
+          rest.put("/nodes/#{node_name}/_acl/#{p}", p => node_perms[p])
         end
       end
 

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.5'
+  VERSION = '0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - John Keiser
@@ -80,6 +80,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: chef-metal-fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef-metal-vagrant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,21 +142,17 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
+- CHANGELOG.md
 - LICENSE
 files:
 - Rakefile
 - LICENSE
 - README.md
-- lib/chef/provider/fog_key_pair.rb
+- CHANGELOG.md
 - lib/chef/provider/machine.rb
 - lib/chef/provider/machine_file.rb
-- lib/chef/provider/vagrant_box.rb
-- lib/chef/provider/vagrant_cluster.rb
-- lib/chef/resource/fog_key_pair.rb
 - lib/chef/resource/machine.rb
 - lib/chef/resource/machine_file.rb
-- lib/chef/resource/vagrant_box.rb
-- lib/chef/resource/vagrant_cluster.rb
 - lib/chef_metal/action_handler.rb
 - lib/chef_metal/aws_credentials.rb
 - lib/chef_metal/convergence_strategy/install_cached.rb
@@ -137,7 +161,6 @@ files:
 - lib/chef_metal/convergence_strategy/no_converge.rb
 - lib/chef_metal/convergence_strategy/precreate_chef_objects.rb
 - lib/chef_metal/convergence_strategy.rb
-- lib/chef_metal/fog.rb
 - lib/chef_metal/inline_resource.rb
 - lib/chef_metal/machine/basic_machine.rb
 - lib/chef_metal/machine/unix_machine.rb
@@ -145,16 +168,11 @@ files:
 - lib/chef_metal/machine.rb
 - lib/chef_metal/openstack_credentials.rb
 - lib/chef_metal/provider_action_handler.rb
-- lib/chef_metal/provisioner/fog_provisioner.rb
-- lib/chef_metal/provisioner/vagrant_provisioner.rb
 - lib/chef_metal/provisioner.rb
-- lib/chef_metal/provisioner_init/fog_init.rb
-- lib/chef_metal/provisioner_init/vagrant_cluster_init.rb
 - lib/chef_metal/recipe_dsl.rb
 - lib/chef_metal/transport/ssh.rb
 - lib/chef_metal/transport/winrm.rb
 - lib/chef_metal/transport.rb
-- lib/chef_metal/vagrant.rb
 - lib/chef_metal/version.rb
 - lib/chef_metal.rb
 homepage: http://wiki.opscode.com/display/chef

data/lib/chef/provider/fog_key_pair.rb

@@ -1,169 +0,0 @@
-require 'chef/provider/lwrp_base'
-require 'chef_metal/provider_action_handler'
-
-class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
-
-  include ChefMetal::ProviderActionHandler
-
-  use_inline_resources
-
-  def whyrun_supported?
-    true
-  end
-
-  action :create do
-    create_key
-  end
-
-  action :delete do
-    if current_resource_exists?
-      converge_by "delete #{key_description}" do
-        case new_resource.provisioner.compute_options[:provider]
-        when 'DigitalOcean'
-          compute.destroy_key_pair(@current_id)
-        when 'OpenStack'
-          compute.key_pairs.destroy(@current_id)
-        else
-          compute.key_pairs.delete(new_resource.name)
-        end
-      end
-    end
-  end
-
-  def key_description
-    "#{new_resource.name} on #{new_resource.provisioner.provisioner_url}"
-  end
-
-  def create_key
-    if current_resource_exists?
-      # If the public keys are different, update the server public key
-      if !current_resource.private_key_path
-        if new_resource.allow_overwrite
-          ensure_keys
-        else
-          raise "#{key_description} already exists on the server, but the private key #{new_resource.private_key_path} does not exist!"
-        end
-      else
-        ensure_keys
-      end
-
-      new_fingerprint = case new_resource.provisioner.compute_options[:provider]
-      when 'DigitalOcean'
-        Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)
-      when 'OpenStack'
-        Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)
-      else
-        Cheffish::KeyFormatter.encode(desired_key, :format => :fingerprint)
-      end
-
-      if new_fingerprint != @current_fingerprint
-        if new_resource.allow_overwrite
-          converge_by "update #{key_description} to match local key at #{new_resource.private_key_path}" do
-            case new_resource.provisioner.compute_options[:provider]
-            when 'DigitalOcean'
-              compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'OpenStack'
-              compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            else
-              compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            end
-          end
-        else
-          raise "#{key_description} does not match local private key, and allow_overwrite is false!"
-        end
-      end
-    else
-      # Generate the private and/or public keys if they do not exist
-      ensure_keys
-
-      # Create key
-      converge_by "create #{key_description} from local key at #{new_resource.private_key_path}" do
-        case new_resource.provisioner.compute_options[:provider]
-        when 'DigitalOcean'
-          compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'OpenStack'
-          compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        else
-          compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        end
-      end
-    end
-  end
-
-  def ensure_keys
-    resource = new_resource
-    Cheffish.inline_resource(self) do
-      private_key resource.private_key_path do
-        public_key_path resource.public_key_path
-        if resource.private_key_options
-          resource.private_key_options.each_pair do |key,value|
-            send(key, value)
-          end
-        end
-      end
-    end
-  end
-
-  def desired_key
-    @desired_key ||= begin
-      if new_resource.public_key_path
-        public_key, format = Cheffish::KeyFormatter.decode(IO.read(new_resource.public_key_path))
-        public_key
-      else
-        private_key, format = Cheffish::KeyFormatter.decode(IO.read(new_resource.private_key_path))
-        private_key.public_key
-      end
-    end
-  end
-
-  def current_resource_exists?
-    @current_resource.action != [ :delete ]
-  end
-
-  def compute
-    new_resource.provisioner.compute
-  end
-
-  def current_public_key
-    current_resource.source_key
-  end
-
-  def load_current_resource
-    if !new_resource.provisioner.kind_of?(ChefMetal::Provisioner::FogProvisioner)
-      raise 'ec2_key_pair only works with fog_provisioner'
-    end
-    @current_resource = Chef::Resource::FogKeyPair.new(new_resource.name)
-    case new_resource.provisioner.compute_options[:provider]
-    when 'DigitalOcean'
-      current_key_pair = compute.ssh_keys.select { |key| key.name == new_resource.name }.first
-      if current_key_pair
-        @current_id = current_key_pair.id
-        @current_fingerprint = current_key_pair ? compute.ssh_keys.get(@current_id).ssh_pub_key : nil
-      else
-        current_resource.action :delete
-      end
-    when 'OpenStack'
-      current_key_pair = compute.key_pairs.get(new_resource.name)
-      if current_key_pair
-        @current_id = current_key_pair.name
-        @current_fingerprint = current_key_pair ? compute.key_pairs.get(@current_id).public_key : nil
-      else
-        current_resource.action :delete  
-      end
-    else
-      current_key_pair = compute.key_pairs.get(new_resource.name)
-      if current_key_pair
-        @current_fingerprint = current_key_pair ? current_key_pair.fingerprint : nil
-      else
-        current_resource.action :delete
-      end
-    end
-
-    if new_resource.private_key_path && ::File.exist?(new_resource.private_key_path)
-      current_resource.private_key_path new_resource.private_key_path
-    end
-    if new_resource.public_key_path && ::File.exist?(new_resource.public_key_path)
-      current_resource.public_key_path new_resource.public_key_path
-    end
-  end
-end

data/lib/chef/provider/vagrant_box.rb

@@ -1,44 +0,0 @@
-require 'chef/provider/lwrp_base'
-require 'chef/mixin/shell_out'
-
-class Chef::Provider::VagrantBox < Chef::Provider::LWRPBase
-
-  use_inline_resources
-
-  include Chef::Mixin::ShellOut
-
-  def whyrun_supported?
-    true
-  end
-
-  action :create do
-    if !list_boxes.has_key?(new_resource.name)
-      if new_resource.url
-        converge_by "run 'vagrant box add #{new_resource.name} #{new_resource.url}'" do
-          shell_out("vagrant box add #{new_resource.name} #{new_resource.url}").error!
-        end
-      else
-        raise "Box #{new_resource.name} does not exist"
-      end
-    end
-  end
-
-  action :delete do
-    if list_boxes.has_key?(new_resource.name)
-      converge_by "run 'vagrant box remove #{new_resource.name} #{list_boxes[new_resource.name]}'" do
-        shell_out("vagrant box remove #{new_resource.name} #{list_boxes[new_resource.name]}").error!
-      end
-    end
-  end
-
-  def list_boxes
-    @list_boxes ||= shell_out("vagrant box list").stdout.lines.inject({}) do |result, line|
-      line =~ /^(\S+)\s+\((.+)\)\s*$/
-      result[$1] = $2
-      result
-    end
-  end
-
-  def load_current_resource
-  end
-end

data/lib/chef/provider/vagrant_cluster.rb

@@ -1,42 +0,0 @@
-require 'chef/provider/lwrp_base'
-require 'chef_metal/provider_action_handler'
-
-class Chef::Provider::VagrantCluster < Chef::Provider::LWRPBase
-
-  include ChefMetal::ProviderActionHandler
-
-  use_inline_resources
-
-  def whyrun_supported?
-    true
-  end
-
-  action :create do
-    the_base_path = new_resource.path
-    ChefMetal.inline_resource(self) do
-      directory the_base_path
-      file ::File.join(the_base_path, 'Vagrantfile') do
-        content <<EOM
-Dir.glob('#{::File.join(the_base_path, '*.vm')}') do |vm_file|
-  eval(IO.read(vm_file), nil, vm_file)
-end
-EOM
-      end
-    end
-  end
-
-  action :delete do
-    the_base_path = new_resource.path
-    ChefMetal.inline_resource(self) do
-      file ::File.join(the_base_path, 'Vagrantfile') do
-        action :delete
-      end
-      directory the_base_path do
-        action :delete
-      end
-    end
-  end
-
-  def load_current_resource
-  end
-end

data/lib/chef/resource/fog_key_pair.rb

@@ -1,34 +0,0 @@
-require 'chef_metal'
-
-class Chef::Resource::FogKeyPair < Chef::Resource::LWRPBase
-  self.resource_name = 'fog_key_pair'
-
-  def initialize(*args)
-    super
-    @provisioner = ChefMetal.enclosing_provisioner
-  end
-
-  def after_created
-    # Make the credentials usable
-    provisioner.key_pairs[name] = self
-  end
-
-  actions :create, :delete, :nothing
-  default_action :create
-
-  attribute :provisioner
-  # Private key to use as input (will be generated if it does not exist)
-  attribute :private_key_path, :kind_of => String
-  # Public key to use as input (will be generated if it does not exist)
-  attribute :public_key_path, :kind_of => String
-  # List of parameters to the private_key resource used for generation of the key
-  attribute :private_key_options, :kind_of => Hash
-
-  # TODO what is the right default for this?
-  attribute :allow_overwrite, :kind_of => [TrueClass, FalseClass], :default => false
-
-  # Proc that runs after the resource completes.  Called with (resource, private_key, public_key)
-  def after(&block)
-    block ? @after = block : @after
-  end
-end