chef-metal 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff00a9a5e38faa2766f8b863f1d1e4f388835d9a
-  data.tar.gz: f9c11bf6e500bd3ce30c1584f737e9c325b39ae3
+  metadata.gz: a47fa35091e77e37a5ee21d98a91aa77438f2193
+  data.tar.gz: fee0d677dd4bb0503179fa71784a75069ab2928b
 SHA512:
-  metadata.gz: 65d59f9815c642ef61f3c105ee4b29f65ab4aa13b9995e91600fce8efd6eab67d9b2a00960d74be740b52aa4bb5099dbf44f524811cbbfcb08f93d3e5c5114af
-  data.tar.gz: bd1be86b6d3a40d0d1d4217d8aafc54f797338469546cf1ac18841bfbcc8cc200aa6fabed214f42ee228cd2ea5c77f1c2909fdf88b9611d93efa284732cc6323
+  metadata.gz: d02701018d7e62a14f9ac0abcbbf4869ca0cacab94e543945e4830dfce67336ea7be7e8055e754d07e56abd8a634821955acabced9e1f8ea467b63bfef33dbf6
+  data.tar.gz: a271c5856f5b695ba8be63ba7ae803d9fd58f18768a8794f34a320e9933d79952df7ade8151cf9b9798aa479ca3ace0b3fcfff4869b7fdb041cf3c501eb5a4a1

data/README.md

@@ -10,12 +10,12 @@ Try It Out
 
 To give it a spin, get chef 11.8 or greater try this:
 
-    git clone https://github.com/jkeiser/cheffish.git
+    git clone https://github.com/opscode/cheffish.git
     cd cheffish
     rake install
     cd ..
 
-    git clone https://github.com/jkeiser/chef-metal.git
+    git clone https://github.com/opscode/chef-metal.git
     cd chef-metal
     rake install
     
@@ -31,9 +31,9 @@ Chef Metal has two major abstractions: the machine resource, and provisioners.
 
 ### The `machine` resource
 
-You declare what your machines do (recipes, tags, etc.) with the `machine` resource, the fundamental unit of Chef Metal.  You will typically declare `machine` resources in a separate, OS/priovisioning-independent file that declares the *topology* of your app--your machines and the recipes that will run on them.
+You declare what your machines do (recipes, tags, etc.) with the `machine` resource, the fundamental unit of Chef Metal.  You will typically declare `machine` resources in a separate, OS/provisioning-independent file that declares the *topology* of your app--your machines and the recipes that will run on them.
 
-The machine resources from the example [myapp::small](https://github.com/jkeiser/chef-metal/blob/master/cookbooks/myapp/recipes/small.rb) are pretty straightforward.  Here's a copy/paste:
+The machine resources from the example [myapp::small](https://github.com/opscode/chef-metal/blob/master/cookbooks/myapp/recipes/small.rb) are pretty straightforward.  Here's a copy/paste:
 
 ```ruby
 machine 'mario' do
@@ -75,7 +75,7 @@ chef-zero comes with a provisioner for Vagrant, an abstraction that covers Virtu
 chef-client -z -o myapp::vagrant,myapp::linux,myapp::small
 ```
 
-The provisioner specification is in myapp::vagrant and myapp::linux [sample recipes](https://github.com/jkeiser/chef-metal/tree/master/cookbooks/myapp/recipes), copy/pasted here for your convenience:
+The provisioner specification is in myapp::vagrant and myapp::linux [sample recipes](https://github.com/opscode/chef-metal/tree/master/cookbooks/myapp/recipes), copy/pasted here for your convenience:
 
 ```ruby
 vagrant_cluster "#{ENV['HOME']}/machinetest"
@@ -90,7 +90,7 @@ end
 
 `vagrant_cluster` declares a directory where all the vagrant definitions will be stored, and uses `with_provisioner` internally to tell Chef Metal that this is the provisioner we want to use for machines.
 
-`vagrant_box` makes sure a particular vagrant box exists, and lets you specify `provisioner_options` for things like port forwarding, OS definitions, and any other vagrant-isms.  A more complicated vagrant box, with provisioner options, can be found in [myapp::windows](https://github.com/jkeiser/chef-metal/blob/master/cookbooks/myapp/recipes/windows.rb).
+`vagrant_box` makes sure a particular vagrant box exists, and lets you specify `provisioner_options` for things like port forwarding, OS definitions, and any other vagrant-isms.  A more complicated vagrant box, with provisioner options, can be found in [myapp::windows](https://github.com/opscode/chef-metal/blob/master/cookbooks/myapp/recipes/windows.rb).
 
 `with_chef_local_server` is a generic directive that creates a chef-zero server pointed at the given repository.  nodes, clients, data bags, and all data will be stored here on your provisioner machine if you do this.  You can use `with_chef_server` instead if you want to point at OSS, Hosted or Enterprise Chef, and if you don't specify a Chef server at all, it will use the one you are running chef-client against.
 
@@ -140,7 +140,7 @@ fog_key_pair 'me' do
 end
 ```
 
-`with_fog_ec2_provisioner` tells chef-metal to use the Fog provisioner against EC2.  If you specify your credentials in `~/.aws/config`, you don't *have* to specify anything else; it will use the Fog defaults.  You may pass a hash of parameters to `with_fog_ec2_provisioner` that is described [here](https://github.com/jkeiser/chef-metal/blob/master/lib/chef_metal/provisioner/fog_provisioner.rb#L21-L32).
+`with_fog_ec2_provisioner` tells chef-metal to use the Fog provisioner against EC2.  If you specify your credentials in `~/.aws/config`, you don't *have* to specify anything else; it will use the Fog defaults.  You may pass a hash of parameters to `with_fog_ec2_provisioner` that is described [here](https://github.com/opscode/chef-metal/blob/master/lib/chef_metal/provisioner/fog_provisioner.rb#L21-L32).
 
 `fog_key_pair` creates a new key pair (if the files do not already exist) and automatically tells the Provisioner to use it to bootstrap subsequent machines.  The private/public key pair will be automatically authorized to log on to the instance on first boot.
 
@@ -155,6 +155,6 @@ You will notice that we are still using `myapp::small` here.  Machine definition
 Bugs and The Plan
 -----------------
 
-It's early days.  *Please* submit bugs at https://github.com/jkeiser/chef-metal/issues, contact jkeiser on Twitter at @jkeiser2, email at jkeiser@opscode.com
+It's early days.  *Please* submit bugs at https://github.com/opscode/chef-metal/issues, contact jkeiser on Twitter at @jkeiser2, email at jkeiser@opscode.com
 
 If you are interested in the Plan for Chef Metal, you can peruse our [Trello board](https://trello.com/b/GcSzW0GM/chef-metal)!  Please add suggestions there, vote or comment on issues that are important to you, and feel free to contribute by picking up a card.  Chat with me (jkeiser@opscode.com) if you would like some context on how to go about implementing a card, or just go hog wild and submit a PR :)

data/lib/chef/provider/fog_key_pair.rb

@@ -15,7 +15,12 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
   action :delete do
     if current_resource_exists?
       converge_by "delete #{key_description}" do
-        compute.key_pairs.delete(new_resource.name)
+        case new_resource.provisioner.compute_options[:provider]
+        when 'DigitalOcean'
+          compute.destroy_key_pair(@current_id)
+        else
+          compute.key_pairs.delete(new_resource.name)
+        end
       end
     end
   end
@@ -37,11 +42,22 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         ensure_keys
       end
 
-      public_key, format = Cheffish::KeyFormatter.decode(IO.read(new_resource.public_key_path))
-      if Cheffish::KeyFormatter.encode(public_key, :format => :fingerprint) != @current_fingerprint
+      new_fingerprint = case new_resource.provisioner.compute_options[:provider]
+      when 'DigitalOcean'
+        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
-            compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            case new_resource.provisioner.compute_options[:provider]
+            when 'DigitalOcean'
+              compute.create_ssh_key(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!"
@@ -53,7 +69,12 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
 
       # Create key
       converge_by "create #{key_description} from local key at #{new_resource.private_key_path}" do
-        compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        case new_resource.provisioner.compute_options[:provider]
+        when 'DigitalOcean'
+          compute.create_ssh_key(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
@@ -72,6 +93,18 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
     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
@@ -89,11 +122,22 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       raise 'ec2_key_pair only works with fog_provisioner'
     end
     @current_resource = Chef::Resource::FogKeyPair.new(new_resource.name)
-    current_key_pair = compute.key_pairs.get(new_resource.name)
-    if current_key_pair
-      @current_fingerprint = current_key_pair.fingerprint
+    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
     else
-      current_resource.action :delete
+      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)

data/lib/chef_metal.rb

@@ -4,13 +4,6 @@ require 'chef/resource/machine'
 require 'chef/provider/machine'
 require 'chef/resource/machine_file'
 require 'chef/provider/machine_file'
-require 'chef/resource/vagrant_cluster'
-require 'chef/provider/vagrant_cluster'
-require 'chef/resource/vagrant_box'
-require 'chef/provider/vagrant_box'
-require 'chef/resource/fog_key_pair'
-require 'chef/provider/fog_key_pair'
-require 'chef_metal/provisioner/fog_provisioner'
 
 require 'chef_metal/inline_resource'
 
@@ -39,29 +32,6 @@ module ChefMetal
     end
   end
 
-  def self.with_vagrant_cluster(cluster_path, &block)
-    require 'chef_metal/provisioner/vagrant_provisioner'
-
-    with_provisioner(ChefMetal::Provisioner::VagrantProvisioner.new(cluster_path), &block)
-  end
-
-  def self.with_vagrant_box(box_name, provisioner_options = nil, &block)
-    require 'chef/resource/vagrant_box'
-
-    if box_name.is_a?(Chef::Resource::VagrantBox)
-      provisioner_options ||= box_name.provisioner_options || {}
-      provisioner_options['vagrant_options'] ||= {}
-      provisioner_options['vagrant_options']['vm.box'] = box_name.name
-      provisioner_options['vagrant_options']['vm.box_url'] = box_name.url if box_name.url
-    else
-      provisioner_options ||= {}
-      provisioner_options['vagrant_options'] ||= {}
-      provisioner_options['vagrant_options']['vm.box'] = box_name
-    end
-
-    with_provisioner_options(provisioner_options, &block)
-  end
-
   def self.inline_resource(provider, &block)
     InlineResource.new(provider).instance_eval(&block)
   end

data/lib/chef_metal/fog.rb

@@ -0,0 +1,4 @@
+require 'chef_metal'
+require 'chef/resource/fog_key_pair'
+require 'chef/provider/fog_key_pair'
+require 'chef_metal/provisioner/fog_provisioner'

data/lib/chef_metal/provisioner/fog_provisioner.rb

@@ -54,14 +54,12 @@ module ChefMetal
 
       def current_base_bootstrap_options
         result = @base_bootstrap_options.dup
-        if compute_options[:provider] == 'AWS'
-          if key_pairs.size > 0
-            last_pair_name = key_pairs.keys.last
-            last_pair = key_pairs[last_pair_name]
-            result[:key_name] ||= last_pair_name
-            result[:private_key_path] ||= last_pair.private_key_path
-            result[:public_key_path] ||= last_pair.public_key_path
-          end
+        if key_pairs.size > 0
+          last_pair_name = key_pairs.keys.last
+          last_pair = key_pairs[last_pair_name]
+          result[:key_name] ||= last_pair_name
+          result[:private_key_path] ||= last_pair.private_key_path
+          result[:public_key_path] ||= last_pair.public_key_path
         end
         result
       end
@@ -122,7 +120,7 @@ module ChefMetal
           if !server
             Chef::Log.warn "Machine #{node['name']} (#{provisioner_output['server_id']} on #{provisioner_url}) is not associated with the ec2 account.  Recreating ..."
             need_to_create = true
-          elsif server.state == 'terminated' # Can't come back from that
+          elsif %w(terminated archive).include?(server.state) # Can't come back from that
             Chef::Log.warn "Machine #{node['name']} (#{server.id} on #{provisioner_url}) is terminated.  Recreating ..."
             need_to_create = true
           else
@@ -249,12 +247,15 @@ module ChefMetal
         provider_identifier = case compute_options[:provider]
           when 'AWS'
             compute_options[:aws_access_key_id]
+          when 'DigitalOcean'
+            compute_options[:digitalocean_client_id]
           else
             '???'
         end
-        "fog:#{compute_options['provider']}:#{provider_identifier}"
+        "fog:#{compute_options[:provider]}:#{provider_identifier}"
       end
 
+      # Not meant to be part of public interface
       def transport_for(server)
         # TODO winrm
         create_ssh_transport(server)
@@ -303,6 +304,28 @@ module ChefMetal
         # User-defined tags override the ones we set
         tags.merge!(bootstrap_options[:tags]) if bootstrap_options[:tags]
         bootstrap_options.merge!({ :tags => tags })
+
+        # Provide reasonable defaults for DigitalOcean
+        if compute_options[:provider] == 'DigitalOcean'
+          if !bootstrap_options[:image_id]
+            bootstrap_options[:image_name] ||= 'CentOS 6.4 x32'
+            bootstrap_options[:image_id] = compute.images.select { |image| image.name == bootstrap_options[:image_name] }.first.id
+          end
+          if !bootstrap_options[:flavor_id]
+            bootstrap_options[:flavor_name] ||= '512MB'
+            bootstrap_options[:flavor_id] = compute.flavors.select { |flavor| flavor.name == bootstrap_options[:flavor_name] }.first.id
+          end
+          if !bootstrap_options[:region_id]
+            bootstrap_options[:region_name] ||= 'San Francisco 1'
+            bootstrap_options[:region_id] = compute.regions.select { |region| region.name == bootstrap_options[:region_name] }.first.id
+          end
+          bootstrap_options[:ssh_key_ids] ||= [ compute.ssh_keys.select { |k| k.name == bootstrap_options[:key_name] }.first.id ]
+
+          # You don't get to specify name yourself
+          bootstrap_options[:name] = node['name']
+        end
+
+        bootstrap_options
       end
 
       def machine_for(node, server = nil)
@@ -332,18 +355,21 @@ module ChefMetal
 
       def ssh_options_for(server)
         result = {
+# TODO create a user known hosts file
 #          :user_known_hosts_file => vagrant_ssh_config['UserKnownHostsFile'],
-#          :paranoid => yes_or_no(vagrant_ssh_config['StrictHostKeyChecking']),
+#          :paranoid => true,
           :auth_methods => [ 'publickey' ],
-          :keys => [ server.private_key ],
-          :keys_only => true
+          :keys_only => true,
+          :host_key_alias => "#{server.id}.#{compute_options[:provider]}"
         }
-        if compute_options[:provider] == 'AWS'
+        if server.respond_to?(:private_key) && server.private_key
+          result[:keys] = [ server.private_key ]
+        elsif server.respond_to?(:key_name) && key_pairs[server.key_name]
           # TODO generalize for others?
-          result[:keys] = [ server.private_key || key_pairs[server.key_name].private_key_path ]
-          result[:host_key_alias] = "#{server.id}.ec2"
+          result[:keys] ||= [ key_pairs[server.key_name].private_key_path ]
         else
-          private_key_path = nil
+          # TODO need a way to know which key if there were multiple
+          result[:keys] = [ key_pairs.first[1].private_key_path ]
         end
         result
       end
@@ -351,11 +377,18 @@ module ChefMetal
       def create_ssh_transport(server)
         require 'chef_metal/transport/ssh'
 
-        ssh_options = ssh_options_for(server)
-        options = {
-          :prefix => 'sudo '
-        }
-        ChefMetal::Transport::SSH.new(server.public_ip_address, 'ubuntu', ssh_options, options)
+        ssh_options, options = ssh_options_for(server)
+        # If we're on AWS, the default is to use ubuntu, not root
+        if compute_options[:provider] == 'AWS'
+          username = compute_options[:ssh_username] || 'ubuntu'
+        else
+          username = compute_options[:ssh_username] || 'root'
+        end
+        options = {}
+        if compute_options[:sudo] || (!compute_options.has_key?(:sudo) && username != 'root')
+          options[:prefix] = 'sudo '
+        end
+        ChefMetal::Transport::SSH.new(server.public_ip_address, username, ssh_options, options)
       end
 
       def wait_until_ready(server, timeout)

data/lib/chef_metal/provisioner/lxc_provisioner.rb

@@ -0,0 +1,135 @@
+require 'chef/mixin/shell_out'
+require 'chef_metal/provisioner'
+require 'lxc'
+
+module ChefMetal
+  class Provisioner
+
+    # Provisions machines in lxc.
+    class LXCProvisioner < Provisioner
+
+      include Chef::Mixin::ShellOut
+
+      #
+      # Acquire a machine, generally by provisioning it.  Returns a Machine
+      # object pointing at the machine, allowing useful actions like setup,
+      # converge, execute, file and directory.  The Machine object will have a
+      # "node" property which must be saved to the server (if it is any
+      # different from the original node object).
+      #
+      # ## Parameters
+      # provider - the provider object that is calling this method.
+      # node - node object (deserialized json) representing this machine.  If
+      #        the node has a provisioner_options hash in it, these will be used
+      #        instead of options provided by the provisioner.  TODO compare and
+      #        fail if different?
+      #        node will have node['normal']['provisioner_options'] in it with any options.
+      #        It is a hash with this format:
+      #
+      #           -- provisioner_url: lxc:<lxc_path>
+      #           -- template: template name
+      #           -- template_options: additional arguments for templates
+      #           -- backingstore: backing storage (lvm, thinpools, btrfs etc)
+      #
+      #        node['normal']['provisioner_output'] will be populated with information
+      #        about the created machine.  For lxc, it is a hash with this
+      #        format:
+      #
+      #           -- provisioner_url: lxc://<lxc_path>
+      #           -- lxc_path: path to lxc root
+      #           -- name: container name
+      #
+      def acquire_machine(provider, node)
+        # TODO verify that the existing provisioner_url in the node is the same as ours
+
+        # Set up the modified node data
+        provisioner_options = node['normal']['provisioner_options']
+        provisioner_output = node['normal']['provisioner_output'] || {
+          'provisioner_url' =>   "lxc://#{lxc_path_for(node)}",
+          'name' => node['name']
+        }
+
+
+        # Create the container if it does not exist
+        ct = LXC::Container.new(provisioner_output['name'], lxc_path_for(node))
+        unless ct.defined?
+          provider.converge_by "create lxc container #{provisioner_output['name']}" do
+            ct.create(provisioner_options['template'], provisioner_options['backingstore'], 0, provisioner_options['template_options'])
+          end
+        end
+        unless ct.running?
+          provider.converge_by "start lxc container #{provisioner_output['name']}" do
+            ct.start
+            while ct.ip_addresses.empty?
+              sleep 1 # wait till dhcp ip allocation is done
+            end
+          end
+        end
+
+        if true # do a check on whether sshd is installed.  This is idempotency!
+          provider.converge_by "install ssh into container #{provisioner_output['name']}" do
+          end
+        end
+
+        node['normal']['provisioner_output'] = provisioner_output
+
+        # Create machine object for callers to use
+        machine_for(node)
+      end
+
+      # Connect to machine without acquiring it
+      def connect_to_machine(node)
+        machine_for(node)
+      end
+
+      def delete_machine(provider, node)
+        if node['normal'] && node['normal']['provisioner_output']
+          provisioner_output = node['normal']['provisioner_output']
+          ct = LXC::Container.new(provisioner_output['name'], lxc_path_for(node))
+          if ct.defined?
+            provider.converge_by "delete lxc container #{provisioner_output['name']}" do
+              ct.destroy
+            end
+          end
+        end
+        convergence_strategy_for(node).delete_chef_objects(provider, node)
+      end
+
+      def stop_machine(provider, node)
+        provisioner_options = node['normal']['provisioner_options']
+        if node['normal'] && node['normal']['provisioner_output']
+          provisioner_output = node['normal']['provisioner_output']
+          ct = LXC::Container.new(provisioner_output['name'], lxc_path_for(node))
+          if ct.running?
+            provider.converge_by "delete lxc container #{provisioner_output['name']}" do
+              ct.stop
+            end
+          end
+        end
+      end
+
+      protected
+
+      def lxc_path_for(node)
+        provisioner_options = node['normal']['provisioner_options']
+        provisioner_options['lxc_path']  || LXC.global_config_item('lxc.lxcpath')
+      end
+
+      def machine_for(node)
+        require 'chef_metal/machine/unix_machine'
+        ChefMetal::Machine::UnixMachine.new(node, transport_for(node), convergence_strategy_for(node))
+      end
+
+      def convergence_strategy_for(node)
+        require 'chef_metal/convergence_strategy/install_sh'
+        ChefMetal::ConvergenceStrategy::InstallSh.new
+      end
+
+      def transport_for(node)
+        require 'chef_metal/transport/lxc'
+        provisioner_output = node['normal']['provisioner_output']
+        ChefMetal::Transport::LXCTransport.new(provisioner_output['name'], lxc_path_for(node))
+      end
+    end
+  end
+end

data/lib/chef_metal/recipe_dsl.rb

@@ -19,8 +19,12 @@ class Chef
       ChefMetal.with_vagrant_box(box_name, vagrant_options, &block)
     end
 
+    def with_fog_provisioner(options = {}, &block)
+      ChefMetal.with_provisioner(ChefMetal::Provisioner::FogProvisioner.new(options, &block))
+    end
+
     def with_fog_ec2_provisioner(options = {}, &block)
-      ChefMetal.with_provisioner(ChefMetal::Provisioner::FogProvisioner.new({ :provider => 'AWS' }.merge(options)), &block)
+      with_fog_provisioner({ :provider => 'AWS' }.merge(options), &block)
     end
   end
 end

data/lib/chef_metal/transport/lxc.rb

@@ -0,0 +1,90 @@
+require 'chef_metal/transport'
+require 'lxc/extra'
+require 'chef/mixin/shell_out'
+
+module ChefMetal
+  class Transport
+    class LXCTransport < Transport
+
+      class LXCExecuteResult < Struct.new(:stdout, :stderr, :exitstatus)
+        def error!
+          raise "Error: code #{exitstatus}.\nSTDOUT:#{stdout}\nSTDERR:#{stderr}" if exitstatus != 0
+        end
+      end
+
+      attr_reader :name, :options, :lxc_path
+
+      include Chef::Mixin::ShellOut
+
+      def initialize(name, lxc_path, options={})
+        @options = options
+        @name = name
+        @lxc_path = lxc_path
+      end
+
+      def ct
+        @container ||= LXC::Container.new(name, lxc_path)
+      end
+
+      def rootfs
+        ct.config_item('lxc.rootfs')
+      end
+
+      def ct_path(path)
+        File.join(rootfs, path)
+      end
+
+      def execute(command)
+        Chef::Log.info("Executing #{command} on #{name}")
+        res = ct.execute do
+                begin
+                  out = shell_out(command)
+                  LXCExecuteResult.new(out.stdout,out.stderr, out.exitstatus)
+                rescue Exception => e
+                  LXCExecuteResult.new('', e.message, -1)
+                end
+              end
+        res
+      end
+
+      def forward_remote_port_to_local(remote_port, local_port)
+        warn 'Port forwarding is not implemented in lxc transport'
+        warn "You can do this on host using:"
+        warn "   'iptables -t nat -A PREROUTING -p tcp --dport #{remote_port} -j DNAT --to #{ct.ip_addresses.first}:#{local_port}'"
+      end
+
+      def read_file(path)
+        if File.exists?(ct_path(path))
+          File.read(ct_path(path))
+        end
+      end
+
+      def download_file(path, local_path)
+        Chef::Log.debug("Copying file #{path} from #{name} to local #{local_path}")
+        FileUtils.cp_r(ct_path(path), local_path)
+      end
+
+      def write_file(path, content)
+        File.open(ct_path(path), 'w') do |f|
+          f.write(content)
+        end
+      end
+
+      def upload_file(local_path, path)
+        FileUtils.cp_r(local_path, ct_path(path))
+      end
+
+      def disconnect
+      end
+
+      def available?
+        begin
+          execute('pwd')
+          true
+        rescue Exception =>e
+          false
+        end
+      end
+    end
+  end
+end

data/lib/chef_metal/vagrant.rb

@@ -0,0 +1,27 @@
+require 'chef_metal'
+require 'chef/resource/vagrant_cluster'
+require 'chef/provider/vagrant_cluster'
+require 'chef/resource/vagrant_box'
+require 'chef/provider/vagrant_box'
+require 'chef_metal/provisioner/vagrant_provisioner'
+
+module ChefMetal
+  def self.with_vagrant_cluster(cluster_path, &block)
+    with_provisioner(ChefMetal::Provisioner::VagrantProvisioner.new(cluster_path), &block)
+  end
+
+  def self.with_vagrant_box(box_name, provisioner_options = nil, &block)
+    if box_name.is_a?(Chef::Resource::VagrantBox)
+      provisioner_options ||= box_name.provisioner_options || {}
+      provisioner_options['vagrant_options'] ||= {}
+      provisioner_options['vagrant_options']['vm.box'] = box_name.name
+      provisioner_options['vagrant_options']['vm.box_url'] = box_name.url if box_name.url
+    else
+      provisioner_options ||= {}
+      provisioner_options['vagrant_options'] ||= {}
+      provisioner_options['vagrant_options']['vm.box'] = box_name
+    end
+
+    with_provisioner_options(provisioner_options, &block)
+  end
+end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-lxc
+  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
@@ -134,18 +148,22 @@ files:
 - lib/chef_metal/convergence_strategy/install_sh.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
 - lib/chef_metal/machine/windows_machine.rb
 - lib/chef_metal/machine.rb
 - lib/chef_metal/provisioner/fog_provisioner.rb
+- lib/chef_metal/provisioner/lxc_provisioner.rb
 - lib/chef_metal/provisioner/vagrant_provisioner.rb
 - lib/chef_metal/provisioner.rb
 - lib/chef_metal/recipe_dsl.rb
+- lib/chef_metal/transport/lxc.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