chef-lxc 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e49fcc3e5851ef433948b2fee48854b397f6c6
-  data.tar.gz: 25871d209911354fa53cf0b7b2ee75cbe0d535df
+  metadata.gz: 0ad048909ff6c48250256ceefeda20d570420936
+  data.tar.gz: b08f1170d5e9fab374ede9d9574a07f3725c6793
 SHA512:
-  metadata.gz: 6bd7b09dc78662584ec3859a518fa5c96e4866f093811e29da3a8b7c31373d3fbe9360573c2605a9e45a0dd5035f9274566127a2bbe39944fecd65e7485ab91c
-  data.tar.gz: 58489515a34b1d6f50960d1fccfd676a009ab8aa1aa035b8e0226d606996ffa7e916af918dae3f115bbc451e368531c874a12a5d75583a96b6aa3da54aea12d5
+  metadata.gz: bf7c7af7788aae3b95d9319d00825d9b1b5cbee099ded9d3942beb253634e5334460dcb7ae312908c1feac22200a20846ef3e09c0cb7ed69387de03293bc46da
+  data.tar.gz: ff715f7e0d96b73c6004c9076dd583284074094441a82e21a824759c99f5c8de44b957f3fc70446009340a48757c6671ee52b857a430d4880a4f670137b1ad15

data/lib/chef/lxc/fleet.rb

@@ -13,25 +13,18 @@ class Chef
       include Chef::LXC::KnifeHelper
 
       def create_container(name, opts = {})
-        from = opts[:from]
         force = opts[:force]
         ct = container(name)
-        if ct.defined? and force
-          ct.stop if ct.running?
-          ct.destroy
-          ct = container(name)
-        end
-        if from
-          base = container(from)
-          base.clone(name)
-          ct = container(name)
+        if ct.defined?
+          if force
+            ct.stop if ct.running?
+            ct.destroy
+            provision(name, opts)
+            ct = container(name)
+          end
         else
-          template = opts[:template] || 'download'
-          bdevtype = opts[:bdevtype]
-          bdevspecs = opts[:bdevspecs] || {}
-          flags = opts[:flags] || 0
-          args = opts[:flags] || %w(-d ubuntu -r trusty -a amd64)
-          ct.create(template, bdevtype, bdevspecs, flags, args)
+          provision(name, opts)
+          ct = container(name)
         end
         ct.start unless ct.running?
         while ct.ip_addresses.empty?
@@ -47,6 +40,24 @@ class Chef
         ct.extend Chef::LXC::ContainerHelper
         ct
       end
+
+      private
+
+      def provision(name, opts)
+        from = opts[:from]
+        if from
+          base = container(from)
+          base.clone(name)
+        else
+          template = opts[:template] || 'download'
+          bdevtype = opts[:bdevtype]
+          bdevspecs = opts[:bdevspecs] || {}
+          flags = opts[:flags] || 0
+          args = opts[:flags] || %w(-d ubuntu -r trusty -a amd64)
+          ct = container(name)
+          ct.create(template, bdevtype, bdevspecs, flags, args)
+        end
+      end
     end
   end
 end

data/lib/chef/lxc/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module LXC
-    VERSION = '0.1'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-lxc
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef