kitchen-lxd 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb8e8006b752908610c409c5d138e712fc11472c
-  data.tar.gz: a62b71d6d1504c16479809006124444918fb901e
+  metadata.gz: d8b4b8d0c6bdd0c29cd0017f24ced51347c69e47
+  data.tar.gz: 51fc54f38b95e6dc5134c819d6fee81f8e336e5c
 SHA512:
-  metadata.gz: f0e9d5a7a1fee40803833b21ddd7c4070abb9ad39fc3a152f3c834c94045e1e61f62c2ad0c3b1922877a05cf5028193dd466be668a010d73d82f7bf389a1d60b
-  data.tar.gz: d46312416e606f2ac76c0d57a2f49f2f5301d85a87cb5bb6307379e40868b1e664fb15dd737699fdab9bcc36ee605dba95292632c55a87b96a4453b4e5ddf8ea
+  metadata.gz: 45825e97e2ab9c3290a4d231099a73ebff730ab1fd3a9f0019c12cf244d7a816272b47949ec02ee16f2883f5c2fade9c29880f8211d863db996eeb86bd69889d
+  data.tar.gz: 82f62bb46aec07952acd8e5872db76fc0a03b17198421dcb42bcf2768f31b61780eb9014c4a5742b82dfc5cf73dff75988cd29465776a36a2c8e50b04aa2cfd0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1 (2017-10-13)
+
+- Add workaround to Ubuntu hostnamectl bug in LXD (https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1575779)
+
 ## 0.2.0 (2017-10-11)
 
 - Add LXD transport.

data/README.md

@@ -1,6 +1,7 @@
 # Kitchen::Lxd
 
-[![Build Status](https://travis-ci.org/zeroturnaround/kitchen-lxd.svg?branch=master)](https://travis-ci.org/zeroturnaround/kitchen-lxd)
+[![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)
 
 - [Requirements](#requirements)
 	- [Lxd](#lxd)
@@ -44,8 +45,10 @@ Example config file may look like this:
 driver:
   name: lxd
   binary: lxc # this is default
-  remote: images # this is default
-  network: lxdbr0 # this is default
+  remote: images # default
+  network: lxdbr0 # default
+  fix_chef_install: false # default
+  fix_hostnamectl_bug: true # default
 
 transport:
   name: lxd
@@ -55,9 +58,11 @@ Default values can be omitted, so the minimal config file looks like this:
 
 ```yaml
 ---
-driver: lxd
+driver:
+  name: lxd
 
-transport: lxd
+transport:
+  name: lxd
 ```
 
 ### Driver
@@ -66,10 +71,12 @@ Available options:
 
 Name | Description | Type | Default
 -----|-------------|------|--------
-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`
+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`
+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`
 
 ## Development
 

data/lib/kitchen/driver/lxd.rb

@@ -34,6 +34,7 @@ module Kitchen
 			default_config :network, 'lxdbr0'
 			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
 
 			default_config :image do |driver|
 				driver.instance.platform.name
@@ -50,6 +51,7 @@ module Kitchen
 
 				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]
+				container.fix_hostnamectl_bug if config[:fix_hostnamectl_bug]
 			end
 
 			def destroy( state )
@@ -68,8 +70,7 @@ module Kitchen
 			end
 
 			def container
-				@container = Lxd::Container.new( logger, config ) if @container.nil?
-				@container
+				@container ||= Lxd::Container.new( logger, config )
 			end
 		end
 	end

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

@@ -98,6 +98,13 @@ module Kitchen
 						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'
+				end
+
 				private
 
 				def image_exists?

data/lib/kitchen/driver/version.rb

@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#		http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,13 +16,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'kitchen'
-
 module Kitchen
 	module Driver
-		class Lxd < Kitchen::Driver::Base
+		class Lxd
 			# Version string for Lxd Kitchen driver
-			VERSION = '0.2.0'
+			VERSION = '0.2.1'
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Juri Timošin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen