chef-metal-lxc 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e51099a4d7f321b3ae716dfe44a06b0a5936a0aa
-  data.tar.gz: 68f2eccc5af59f02ba3d509c8f254083a65e2acb
+  metadata.gz: 2ed7dfed2acc5f5c14b12786111cf062074f2165
+  data.tar.gz: c34889c04ef95bea3ae6b036a24a39bcd270b654
 SHA512:
-  metadata.gz: 043eb415ad9ba38b14f6f6ca6bfb0b94e819785dffb5767cb70ecc25a99d64cbb88b66652bfc2cc873d048c52496e5129e6e95437479905479af72e2efd30830
-  data.tar.gz: 914a6b0cf84a208bac0f170ea89698d2ac62f38314a464fa7749ee708113a084e88c8331e43d5f7f9f4ab7259f37e93cd1e7f030bc3014402265ac3d1174326b
+  metadata.gz: a93dab3facce1903bb30177604f07140881749e28f24668cc3e8f28de1c73f3a2b893b36ec7a3539a0de83c2286efa6247843bbdda0a29bad4476c72f2e4aa19
+  data.tar.gz: e717b1b724124d7e1d0c9e34cdb63b1b7bee0ebc7e9c2145395020134e23f6b1243215cd39346d0111d28600ca295849e16b4048fc708cc1d3b842ce7f40438a

data/lib/chef_metal_lxc/lxc_provisioner.rb

@@ -26,7 +26,7 @@ module ChefMetalLXC
     # different from the original node object).
     #
     # ## Parameters
-    # provider - the provider object that is calling this method.
+    # action_handler - the action_handler object that provides context.
     # 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
@@ -48,7 +48,7 @@ module ChefMetalLXC
     #           -- provisioner_url: lxc:<lxc_path>
     #           -- name: container name
     #
-    def acquire_machine(provider, node)
+    def acquire_machine(action_handler, node)
       # TODO verify that the existing provisioner_url in the node is the same as ours
 
       # Set up the modified node data
@@ -61,7 +61,7 @@ module ChefMetalLXC
       # Create the container if it does not exist
       ct = LXC::Container.new(provisioner_output['name'], lxc_path)
       unless ct.defined?
-        provider.converge_by "create lxc container #{provisioner_output['name']}" do
+        action_handler.perform_action "create lxc container #{provisioner_output['name']}" do
           #
           # Set config
           #
@@ -84,14 +84,14 @@ module ChefMetalLXC
 
       # Unfreeze the frozen
       if ct.state == :frozen
-        provider.converge_by "unfreeze lxc container #{provisioner_output['name']} (state is #{ct.state})" do
+        action_handler.perform_action "unfreeze lxc container #{provisioner_output['name']} (state is #{ct.state})" do
           ct.unfreeze
         end
       end
 
       # Get stopped containers running
       unless ct.running?
-        provider.converge_by "start lxc container #{provisioner_output['name']} (state is #{ct.state})" do
+        action_handler.perform_action "start lxc container #{provisioner_output['name']} (state is #{ct.state})" do
           # Have to shell out to lxc-start for now, ct.start holds server sockets open!
           lxc_start = "lxc-start -d -n #{Shellwords.escape(provisioner_output['name'])}"
 # TODO add ability to change options on start
@@ -118,26 +118,26 @@ module ChefMetalLXC
       machine_for(node)
     end
 
-    def delete_machine(provider, node)
+    def delete_machine(action_handler, node)
       if node['normal'] && node['normal']['provisioner_output']
         provisioner_output = node['normal']['provisioner_output']
         ct = LXC::Container.new(provisioner_output['name'], lxc_path)
         if ct.defined?
-          provider.converge_by "delete lxc container #{provisioner_output['name']}" do
+          action_handler.perform_action "delete lxc container #{provisioner_output['name']}" do
             ct.destroy
           end
         end
       end
-      convergence_strategy_for(node).delete_chef_objects(provider, node)
+      convergence_strategy_for(node).delete_chef_objects(action_handler, node)
     end
 
-    def stop_machine(provider, node)
+    def stop_machine(action_handler, 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)
         if ct.running?
-          provider.converge_by "delete lxc container #{provisioner_output['name']}" do
+          action_handler.perform_action "delete lxc container #{provisioner_output['name']}" do
             ct.stop
           end
         end

data/lib/chef_metal_lxc/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalLXC
-  VERSION = '0.1.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-lxc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -28,16 +28,16 @@ dependencies:
   name: chef-metal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: ruby-lxc
   requirement: !ruby/object:Gem::Requirement