kitchen-vz 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bf73d0a9618e839b979290bc316e954e599ad2b
-  data.tar.gz: 60bbface59b54d4d90f38fc90369b96445f89909
+  metadata.gz: 26d28c6e026fec30c78adec6069fcafc53f48c18
+  data.tar.gz: 1240a2ec9c2f869e25658fe1cb75a5b296e55635
 SHA512:
-  metadata.gz: 8b8028692e37e9b830428025296864564e449b6a3e1a53012d20836eb10563081e7ef5721f68abc5a1478e5abacca714dae2ecfffbbbda8bae9a8ce313946eb8
-  data.tar.gz: 2a2ac99562a167204b59acd3868ce45a391b67da9adec9c15572dc2ed59a6527133658ec2f4c83bd70ab431823b278b7a16678b83f42f308c398d9d0718462dd
+  metadata.gz: d2614c137bf77f6fd3445df14ff1c75620e62f7f62d34f2dce975cb29959e3a48c52291d51e29cfe4520b2298ec1aa4a75911f4417eec979c7354fb3b2daa8ce
+  data.tar.gz: 1e76e21db61060d93d70de593b41658f42a22223e11a1312bc7021130ded74e2d44266732860ff9edaa2914f5462474cba628072670f0dba19850fbdfb6c100a

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .kitchen
+.kitchen.local.yml

data/.kitchen.yml

@@ -8,7 +8,9 @@ provisioner:
 platforms:
   - name: centos-6.6
     driver:
-      socket: 'ssh://cookbook-ci.prls.net'
+      socket: 'ssh://virtuozzo.your-domain.loc'
+      additional_options:
+        ["--features nfs:on", "--features nfsd:on"]
       network:
         Bridged:
           dhcp: true

data/.rubocop.yml

@@ -22,7 +22,7 @@ Metrics/AbcSize:
   Enabled: false
 PerceivedComplexity:
   Enabled: false
-Lint/SpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.1.3
+
+* Add `additional_options` option. This option allows to set additional options for container, such as features.
+
+## 0.1.2
+
+* Add support of a centos 5
+* Fix bug with incorrect re-creating of containers
+* Fix bug, when the container does not have time to get IP address
+
 ## 0.1.0
 
 * Initial release

data/README.md

@@ -40,6 +40,7 @@ Example `.kitchen.local.yml`:
 |:public_key|Path to public key. This key pair used by the kitchen to login into container.|.kitchen/kitchen_id_rsa.pub|
 |:ostemplate|Virtuozzo template which will be used for container creating.||
 |:use_sudo|It shows will sudo be used or not.|true|
+|:additional_options|Array with `prlctl set` options, which will be pass as is. Example: ["--features nfs:on"]|[]|
 |:ct_hostname|Container hostname.|It is formed from platform name and suite name.|
 
 ### Network configuration

data/lib/kitchen/driver/vz.rb

@@ -23,12 +23,10 @@ require 'net/ssh'
 
 module Kitchen
   module Driver
-
     # Virtuozzo driver for Kitchen.
     #
     # @author Pavel Yudin <pyudin@parallels.com>
     class Vz < Kitchen::Driver::SSHBase
-
       default_config :socket, 'local'
       default_config :username, 'kitchen'
       default_config :private_key, File.join(Dir.pwd, '.kitchen', 'kitchen_id_rsa')
@@ -38,6 +36,7 @@ module Kitchen
       default_config :arch, 'x86_64'
       default_config :customize, memory: '512M', disk: '10G', cpus: 2
       default_config :ostemplate, nil
+      default_config :additional_options, []
       default_config :ct_hostname do |driver|
         driver.instance.name
       end
@@ -52,6 +51,7 @@ module Kitchen
         set_ct_cpu(state)
         set_ct_mem(state)
         set_ct_disk(state)
+        set_additional_options(state)
         run_ct(state)
         create_user(state)
         state[:hostname] = ct_ip(state)
@@ -76,7 +76,7 @@ module Kitchen
       def generate_keys
         if !File.exist?(config[:public_key]) || !File.exist?(config[:private_key])
           private_key = OpenSSL::PKey::RSA.new(2048)
-          blobbed_key = Base64.encode64(private_key.to_blob).gsub("\n", '')
+          blobbed_key = Base64.encode64(private_key.to_blob).delete("\n")
           public_key = "ssh-rsa #{blobbed_key} kitchen_key"
           File.open(config[:private_key], 'w') do |file|
             file.write(private_key)
@@ -123,6 +123,12 @@ module Kitchen
         execute_command("#{vzctl} set #{state[:ct_id]} --diskspace #{ds}:#{ds} --save")
       end
 
+      def set_additional_options(state)
+        unless config[:additional_options].empty?
+          execute_command("#{prlctl} set #{state[:ct_id]} #{config[:additional_options].join(' ')}")
+        end
+      end
+
       def run_ct(state)
         execute_command("#{prlctl} start #{state[:ct_id]}")
       end
@@ -145,14 +151,14 @@ module Kitchen
 
       def ct_ip(state)
         ip = nil
-        1..30.times do
+        30.times do
           output = execute_command("#{vzctl} exec #{state[:ct_id]} \"/sbin/ip -o -f inet addr show dev eth0\"")
           result = %r{(([0-9]{1,3}\.){3}[0-9]{1,3})\/[0-9]{1,2}}.match(output)
           ip = result[1] if result
           break if ip
           sleep(1)
         end
-        raise "Can't detect an IP!" if !ip
+        raise "Can't detect an IP!" unless ip
         ip
       end
 

data/lib/kitchen/driver/vz_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Vz Kitchen driver
-    VZ_VERSION = '0.1.2'.freeze
+    VZ_VERSION = '0.1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vz
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Pavel Yudin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A Virtuozzo driver for Test Kitchen