kitchen-gogetkitchen 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f85ceefc301099b51bcfe09354ee1e6eea399e833ae22a12b870dd127cbef77
-  data.tar.gz: 8d95de03f82598e6210ac1a17030facc6142b756071671d130fa279d0f3d7828
+  metadata.gz: c8fc862c8ed788875141bce93f430c7d2f9eb4b4a930fdbdde7458e27d0862da
+  data.tar.gz: 7a12b10d7eee2d8314d2804a3521df7bd68d1d41fea5a3eb2b2a05d42fb39dbe
 SHA512:
-  metadata.gz: d91f6330babffef2b82d0c18109d65199851754071e997257e83beb8111c9ad74d037c954e5d50dfcad462604b1f87d555c477be9f85c32278640b373a9577f5
-  data.tar.gz: a1eff4e2b9c43eb8dd7978890d44f9d7f4d1dc166d917fb7c7dcd215e3ce958aff63fe20bd19e16a9db350fe82ddec1e8e3dec89bd08375a86d75f0d18c8ecb5
+  metadata.gz: 1a1488d72243c55e80c40adf2a75622d9b29b50922de6a0701b5bd0ea5810d73740ee741c4cfd239f9fd42396db4091f636dc5fbedd2bb8ad94b24beaa394194
+  data.tar.gz: 585d83701bdbcd782b16321e04d68d259c3e10a6edb2b952dca51f6dbfda4a9ef9ca303f0eda428185843f02d0ac511144d36d3633e51e630dd96158a5e55180

data/README.md

@@ -19,7 +19,7 @@ $ gem install kitchen-gogetkitchen
 
 ```
 ## <a name="config"></a> Configuration
-
+For lxd provider
 ```yaml
 
 ---
@@ -39,12 +39,32 @@ platforms:
       template: default
       options:
         maas-on-lxc: true
+
+suites:
+  - name: default
+    run_list:
+      - recipe[all_nodes::default]
+    attributes:
+
+```
+
+For kvm(libvirt) provider
+```yaml
+
+---
+driver:
+  name: gogetkitchen
+
+provisioner:
+  name: chef_zero
+
+transport:
+  ssh_key: <%= Dir.home + '/.ssh/id_rsa' %>
+
+platforms:
   - name: kvm01
     driver:
-      provider: libvirt
-      template: default
-      options:
-        lxd-in-lxd: true
+      provider: kvm
 
 suites:
   - name: default
@@ -53,6 +73,12 @@ suites:
     attributes:
 
 ```
+## Provider specific behaviors
+For KVM(Libvirt)
+- It will always use `deploy`/`release` pair once `create`d.
+For LXD
+- It is able to convey `options` which Gogetit LXD provider comsumes.
+
 
 ## <a name="Uninstall"></a> Uninstall
 
@@ -64,22 +90,6 @@ gem uninstall kitchen-gogetkitchen gogetit maas-client
 
 ```
 
-### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus
-
-Determines whether or not a Chef [Omnibus package][chef_omnibus_dl] will be
-installed. There are several different behaviors available:
-
-* `true` - the latest release will be installed. Subsequent converges
-  will skip re-installing if chef is present.
-* `latest` - the latest release will be installed. Subsequent converges
-  will always re-install even if chef is present.
-* `<VERSION_STRING>` (ex: `10.24.0`) - the desired version string will
-  be passed the the install.sh script. Subsequent converges will skip if
-  the installed version and the desired version match.
-* `false` or `nil` - no chef is installed.
-
-The default value is unset, or `nil`.
-
 ## <a name="development"></a> Development
 
 * Source hosted at [GitHub][repo]

data/lib/kitchen/driver/gogetkitchen.rb

@@ -38,10 +38,29 @@ module Kitchen
       Gogetit.config[:consumer] = 'kitchen'
 
       def create(state)
-        options = { 'alias' => config[:template] } if config[:template]
-        options.merge!(config[:options])
+        options = {}
+
+        # for LXD
+        options['alias'] = config[:template] if config[:template]
+
+        # to receive new other options
+        options.merge!(config[:options]) if config[:options]
+
         provider = choose_provider(config[:provider])
-        result = provider.create(instance.name, options)
+
+        case provider
+        when Gogetit::GogetLibvirt
+
+          if Gogetit.maas.machine_exists?(instance.name)
+            result = provider.deploy(instance.name, options)
+          else
+            result = provider.create(instance.name, options)
+          end
+
+        when Gogetit::GogetLXD
+          result = provider.create(instance.name, options)
+        end
+
         domain = Gogetit.maas.get_domain
         state[:hostname]      = instance.name + '.' + domain
         state[:username]      = result[:info][:default_user]
@@ -55,10 +74,14 @@ module Kitchen
       end
 
       def destroy(state)
-        options = {}
-        options.merge!(config[:options])
         provider = choose_provider(config[:provider])
-        provider.destroy(instance.name)
+
+        case provider
+        when Gogetit::GogetLibvirt
+          provider.release(instance.name)
+        when Gogetit::GogetLXD
+          provider.destroy(instance.name)
+        end
 
         instance.transport.connection(state).close
       end
@@ -67,7 +90,9 @@ module Kitchen
         case provider
         when 'lxd'
           Gogetit.lxd
-        when 'libvirt'
+        when 'kvm'
+          # kvm externally but libvirt internally
+          # because gogetit actually handles libvirtd
           Gogetit.libvirt
         end
       end

data/lib/kitchen/driver/gogetkitchen_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Gogetkitchen Kitchen driver
-    GOGETKITCHEN_VERSION = "0.3.0"
+    GOGETKITCHEN_VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-gogetkitchen
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen