kitchen-lxd 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5f6f350edea90a709ffead687670c907a9c633
-  data.tar.gz: bf6eb5e0662a9192eaab03da7bff0e76365e0594
+  metadata.gz: f28028bf2f69eaa9be7c98c1bb0f68ed5303be9e
+  data.tar.gz: 9d39f38481d261a1ebf3f2c1828a3630c8d2cbb8
 SHA512:
-  metadata.gz: d666a0dcce090ba13431e6a52841ea8713068785d9efb85051bd785edb56401f1fc5b442e374e5a27219390f75846effd190fddcab291f8b30bc452fb17f42a3
-  data.tar.gz: c8b7037a3a11d3317c688e81f117fa8f2d8397a388e16c1faf555a0e698e2d2d5d8d007b3133642a36e557ba197655aabe79b913b9154f9f250235e25737a508
+  metadata.gz: e223c9baca53df42e742e0367d69f64938a4e6da4e9cfdff50f75b700ce012c91ccaa04dc4f5776d0b9fa7ca1035f1d9c1228d3fc3f62f48467fdec2e8cb8746
+  data.tar.gz: 0da0cf8822f0a5414fcca6c153d83178934668c1ce0b3b0ab6590be32da89729bd2b4dd070ea7199ec099e45a282259f698908e1ff6b65f1d2373f9c41be9095

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0 (June 2, 2018)
+
+- Introduce `config` parameter in configuration that is passed to `lxc init` as `--config`
+  parameter.
+
 ## 0.2.2 (January 30, 2018)
 
 - Fix upload bug.

data/README.md

@@ -1,5 +1,12 @@
 # Kitchen::Lxd
 
+[author]:           https://github.com/DracoAter
+[issues]:           https://github.com/DracoAter/kitchen-lxd/issues
+[license]:          https://github.com/DracoAter/kitchen-lxd/blob/master/LICENSE
+[repo]:             https://github.com/DracoAter/kitchen-lxd
+[hostnamectl bug]: https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1575779
+[lxd_doc]: https://github.com/lxc/lxd/blob/master/doc/containers.md
+
 [![Build Status](https://travis-ci.org/DracoAter/kitchen-lxd.svg?branch=master)](https://travis-ci.org/DracoAter/kitchen-lxd)
 [![Gem Version](https://badge.fury.io/rb/kitchen-lxd.svg)](https://badge.fury.io/rb/kitchen-lxd)
 
@@ -49,6 +56,7 @@ driver:
   network: lxdbr0 # default
   fix_chef_install: false # default
   fix_hostnamectl_bug: true # default
+  config: {} # default
 
 transport:
   name: lxd
@@ -65,6 +73,17 @@ transport:
   name: lxd
 ```
 
+You can specify different keys/values under `config`. Look for list of the available items in
+[Lxd Documentation][lxd_doc]. For example, if you need to start container in privileged mode, add:
+
+```yaml
+---
+driver:
+  name:lxd
+  config:
+    security.privileged: true
+```
+
 ### Driver
 
 Available options:
@@ -75,8 +94,9 @@ binary | Path to lxc executable. | String | `lxc`
 remote | Remote LXD server to download image from, if it does not exist locally. | String | `images`
 network | Network bridge to attach to container. | String | `lxdbr0`
 wait_until_ready | Wait for the network to come up. | Boolean | `true`
+config | Config key/value to apply to the new container. This hash is passed to `lxc init` command as --config parameters. | Hash | `{}`
 fix_chef_install | Apply fix, to make available installation of Chef Omnibus package. | Boolean | `false`
-fix_hostnamectl_bug | Apply workaround to Ubuntu [hostnamectl bug](https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1575779) in LXD. | Boolean | `true`
+fix_hostnamectl_bug | Apply workaround to Ubuntu [hostnamectl bug][hostnamectl bug] in LXD. | Boolean | `true`
 
 ## Development
 
@@ -100,8 +120,3 @@ Created and maintained by [Juri Timošin][author].
 ## License
 
 Apache 2.0 (see [LICENSE][license])
-
-[author]:           https://github.com/DracoAter
-[issues]:           https://github.com/DracoAter/kitchen-lxd/issues
-[license]:          https://github.com/DracoAter/kitchen-lxd/blob/master/LICENSE
-[repo]:             https://github.com/DracoAter/kitchen-lxd

data/lib/kitchen/driver/lxd.rb

@@ -1,8 +1,10 @@
-# -*- encoding: utf-8 -*-
+
+# frozen_string_literal: true
+
 #
-# Author:: Juri Timošin (<draco.ater@gmail.com>)
+# Author:: Juri Timoshin (<draco.ater@gmail.com>)
 #
-# Copyright (C) 2017, Juri Timošin
+# Copyright (C) 2017, Juri Timoshin
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,8 +25,9 @@ module Kitchen
 	module Driver
 		# Lxd driver for Kitchen.
 		#
-		# @author Juri Timošin <draco.ater@gmail.com>
+		# @author Juri Timoshin <draco.ater@gmail.com>
 		class Lxd < Kitchen::Driver::Base
+			include ShellOut
 			MIN_LXD_VERSION = '2.3'
 
 			kitchen_driver_api_version 2
@@ -32,6 +35,7 @@ module Kitchen
 			default_config :binary, 'lxc'
 			default_config :remote, 'images'
 			default_config :network, 'lxdbr0'
+			default_config :config, {}
 			default_config :wait_until_ready, true
 			default_config :fix_chef_install, false
 			default_config :fix_hostnamectl_bug, true # https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1575779
@@ -44,33 +48,33 @@ module Kitchen
 				driver.instance.name
 			end
 
-			def create( state )
-				container.init
+			def create(state)
+				container.init(config[:config])
 				container.attach_network config[:network] if config[:network]
 				container.start
 
-				state[:hostname] = instance.transport.connection( state ).wait_until_ready if config[:wait_until_ready]
-				container.fix_chef_install( instance.platform.name ) if config[:fix_chef_install]
+				if config[:wait_until_ready]
+					state[:hostname] = instance.transport.connection(state).wait_until_ready
+				end
+				container.fix_chef_install(instance.platform.name) if config[:fix_chef_install]
 				container.fix_hostnamectl_bug if config[:fix_hostnamectl_bug]
 			end
 
-			def destroy( state )
-				instance.transport.connection( state ).close
+			def destroy(state)
+				instance.transport.connection(state).close
 				state.delete :hostname
 				container.destroy
 			end
 
 			def verify_dependencies
-				return
-				version = run_command( "#{config[:binary]} --version" ).strip
-				if Gem::Version.new( version ) < Gem::Version.new( MIN_LXD_VERSION )
-					raise UserError, "Detected old version of Lxd (#{version}), please upgrade to version "\
-						"#{MIN_LXD_VERSION} or higher."
-				end
+				version = run_command("#{config[:binary]} --version").strip
+				return if Gem::Version.new(version) >= Gem::Version.new(MIN_LXD_VERSION)
+				raise UserError, "Detected old version of Lxd (#{version}), please upgrade to version "\
+					"#{MIN_LXD_VERSION} or higher."
 			end
 
 			def container
-				@container ||= Lxd::Container.new( logger, config )
+				@container ||= Lxd::Container.new(logger, config)
 			end
 		end
 	end

data/lib/kitchen/driver/lxd/container.rb

@@ -1,8 +1,10 @@
-# -*- encoding: utf-8 -*-
+
+# frozen_string_literal: true
+
 #
-# Author:: Juri Timošin (<draco.ater@gmail.com>)
+# Author:: Juri Timoshin (<draco.ater@gmail.com>)
 #
-# Copyright (C) 2017, Juri Timošin
+# Copyright (C) 2017, Juri Timoshin
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,33 +31,35 @@ module Kitchen
 				attr_reader :logger
 				attr_reader :state
 
-				def initialize( logger, opts )
+				def initialize(logger, opts)
 					@logger = logger
 					@name = opts[:container]
 					@image = opts[:image]
 					@remote = opts[:remote]
 					@binary = opts[:binary]
+					@fix_hostnamectl_bug = opts[:fix_hostnamectl_bug]
 				end
 
-				def init
+				def init(config={})
 					return if created?
 					download_image unless image_exists?
-					run_command "#@binary init #@image #@name"
+					config_args = config.map{|k, v| "-c #{k}='#{v}'" }.join(' ')
+					run_command "#{@binary} init #{@image} #{@name} #{config_args}"
 				end
 
-				def attach_network( network )
+				def attach_network(network)
 					return if device_attached? network
-					run_command "#@binary network attach #{network} #@name"
+					run_command "#{@binary} network attach #{network} #{@name}"
 				end
 
 				def start
 					return if running?
-					run_command "#@binary start #@name"
+					run_command "#{@binary} start #{@name}"
 				end
 
 				def destroy
 					return unless created?
-					run_command "#@binary delete #@name --force"
+					run_command "#{@binary} delete #{@name} --force"
 				end
 
 				def wait_until_ready
@@ -66,55 +70,58 @@ module Kitchen
 							i[:family] == 'inet'
 						end
 						return inet[:address] if inet
-						sleep 1 unless defined?( Kitchen::Driver::UnitTest )
+						sleep 1 unless defined?(Kitchen::Driver::UnitTest)
 					end
 					nil
 				end
 
 				def download_image
-					run_command "#@binary image copy --copy-aliases #@remote:#@image local:"
+					run_command "#{@binary} image copy --copy-aliases #{@remote}:#{@image} local:"
 				end
 
-				def execute( command )
+				def execute(command)
 					return if command.nil? or command.empty?
-					run_command "#@binary exec #@name -- #{command}"
+					fix_hostnamectl_bug if @fix_hostnamectl_bug
+					run_command "#{@binary} exec #{@name} -- #{command}"
 				end
 
 				def login_command
-					LoginCommand.new( "#@binary exec #@name -- sh", {} )
+					LoginCommand.new("#{@binary} exec #{@name} -- $(#{@binary} exec #{@name} -- head -1 "\
+						'/etc/passwd | cut -d: -f7)', {})
 				end
 
-				def upload( locals, remote )
-					# Mixlib::ShellOut.new("#@binary file push --verbose --debug -r #{locals.join(' ')} #@name#{remote}" ).run_command
-					run_command "#@binary file push -r #{locals.join(' ')} #@name#{remote}"
+				def upload(locals, remote)
+					return if locals.nil? or locals.empty?
+					run_command "#{@binary} file push -r #{locals.join(' ')} #{@name}#{remote}"
 				end
 
-				def fix_chef_install( platform )
+				def fix_chef_install(platform)
 					case platform
 					when /ubuntu/, /debian/
-						execute "apt install -y wget"
+						execute 'apt-get update'
+						execute 'apt-get install -y wget'
 					when /rhel/, /centos/
 						execute 'yum install -y sudo wget'
 					end
 				end
 
 				def fix_hostnamectl_bug
-					logger.info "Replace /usr/bin/hostnamectl with /usr/bin/true, because of bug in Ubuntu. (https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1575779)"
-					execute 'rm /usr/bin/hostnamectl'
-					execute 'ln -s /usr/bin/true /usr/bin/hostnamectl'
+					logger.info 'Replace /usr/bin/hostnamectl with /usr/bin/true, because of bug in Ubuntu'\
+						'. (https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1575779)'
+					run_command "#{@binary} exec #{@name} -- ln -fs /usr/bin/true /usr/bin/hostnamectl"
 				end
 
-#				private
+    #				private
 
 				def image_exists?
 					!JSON.parse(
-						run_command( "#@binary image list #@image --format json" ), symbolize_names: true
+						run_command("#{@binary} image list #{@image} --format json"), symbolize_names: true
 					).empty?
 				end
 
 				def fetch_state
 					@state = JSON.parse(
-						run_command( "#@binary list #@name --format json" ), symbolize_names: true
+						run_command("#{@binary} list #{@name} --format json"), symbolize_names: true
 					).first
 				end
 
@@ -126,7 +133,7 @@ module Kitchen
 					!fetch_state.nil?
 				end
 
-				def device_attached?( network )
+				def device_attached?(network)
 					fetch_state.dig(:devices, network.to_sym) ? true : false
 				end
 			end

data/lib/kitchen/driver/version.rb

@@ -1,8 +1,10 @@
-# -*- encoding: utf-8 -*-
+
+# frozen_string_literal: true
+
 #
-# Author:: Juri Timošin (<draco.ater@gmail.com>)
+# Author:: Juri Timoshin (<draco.ater@gmail.com>)
 #
-# Copyright (C) 2017, Juri Timošin
+# Copyright (C) 2017, Juri Timoshin
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +22,7 @@ module Kitchen
 	module Driver
 		class Lxd
 			# Version string for Lxd Kitchen driver
-			VERSION = '0.2.2'
+			VERSION = '0.3.0'
 		end
 	end
 end

data/lib/kitchen/transport/lxd.rb

@@ -1,8 +1,10 @@
-# -*- encoding: utf-8 -*-
+
+# frozen_string_literal: true
+
 #
-# Author:: Juri Timošin (<draco.ater@gmail.com>)
+# Author:: Juri Timoshin (<draco.ater@gmail.com>)
 #
-# Copyright (C) 2017, Juri Timošin
+# Copyright (C) 2017, Juri Timoshin
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +25,7 @@ module Kitchen
 	module Transport
 		# Transport for Lxd driver for Kitchen.
 		#
-		# @author Juri Timošin <draco.ater@gmail.com>
+		# @author Juri Timoshin <draco.ater@gmail.com>
 		class Lxd < Base
 			kitchen_transport_api_version 2
 
@@ -31,16 +33,16 @@ module Kitchen
 				transport.instance.driver.container
 			end
 
-			def connection( state, &block )
-				@connection = Connection.new( config.to_hash.merge( state ), &block )
+			def connection(state, &block)
+				@connection = Connection.new(config.to_hash.merge(state), &block)
 			end
 
 			class Connection < Base::Connection
 				extend Forwardable
 
-				def initialize( opts )
+				def initialize(opts)
 					@container = opts[:container]
-					super( opts )
+					super(opts)
 				end
 
 				def_delegators :@container, :execute, :login_command, :upload, :wait_until_ready

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Juri Timošin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: ci_reporter_minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.5'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter_minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement