kitchen-lxd_cli 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd56e6cb62ec4b0bf4f099521e195d42bacb3a90
-  data.tar.gz: ee398952d35afd1145877c0e587a82b01f63195c
+  metadata.gz: b72ba2a22edb8adb3ee21e394eb133b532270a33
+  data.tar.gz: e758ef7199090d29672a0715b064bedcb6fe578e
 SHA512:
-  metadata.gz: f842f5c0031c0dbaa23dc839f57905981bfbae95f436da9c55f5903b452e19cb342f455273adfd737c84e1980b081fe331b4150d90727bc4f7544933bc9893b4
-  data.tar.gz: 1f6180cb8e220ee0e86ea6da7b884ce083f1cd3d297b9eb6d816f2fa0936691924ae76f8917c780721a1134be0586de7ed8590d2781a3a7eb4d9a7bfb02076fe
+  metadata.gz: 1bc3eef0b7531b1fafe449d87618ee64015e8e184dbf194d23c2b8914c9f9a4ed5197c490aca7d27b9bf628d8dbb28e40db49b4505e320035643ec7c2806690f
+  data.tar.gz: b12cc296130ace2e4f5f55553da219972e8d3d70c0802007b4747efa55c8f3e8706598ec561c613ac1ef435282110be084d7dd6522302d6ba013e82112ad2f6f

data/README.md

@@ -75,12 +75,12 @@ driver:
   ipv4: 10.0.3.99/24
   ip_gateway: 10.0.3.1
   verifier_path: "/opt/verifier"
-  stop_instead_of_destroy: true
   publish_image_name: "kitchen-base-ubuntu-1404"
   use_publish_image: true
   publish_image_before_destroy: true
   publish_image_overwrite: true
   enable_wait_for_ssh_login: false
+  username: kitchen-user
 
 
 
@@ -363,6 +363,12 @@ Default is false.  If set to true container will loop until it can login to ssh,
 
 NOTE: Hope is that I can resolve the issues of needing to wait by writing a transport that uses lxc commands and not ssh, also will improve sped since ssh login is slow.
 
+### username
+
+Default is `root`. If set to another user name will create home directory and set to `${username} ALL=(ALL) NOPASSWD: ALL` on `/etc/sudoers`.
+
+`username: kitchen-user`
+ 
 ### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus
 
 Determines whether or not a Chef [Omnibus package][chef_omnibus_dl] will be

data/lib/kitchen/driver/lxd_cli.rb

@@ -39,6 +39,7 @@ module Kitchen
       default_config :never_destroy, false
       default_config :lxd_proxy_path, "#{ENV['HOME']}/.lxd_proxy"
       default_config :lxd_proxy_update, false
+      default_config :username, "root"
       
       required_config :public_key_path
 
@@ -57,6 +58,7 @@ module Kitchen
         configure_dns
         lxc_ip = wait_for_ip_address
         state[:hostname] = lxc_ip
+        state[:username] = config[:username]
         setup_ssh_access
         wait_for_ssh_login(lxc_ip) if config[:enable_wait_for_ssh_login] == "true"
         IO.popen("lxc exec #{instance.name} bash", "r+") do |p|
@@ -286,11 +288,22 @@ module Kitchen
 
         def setup_ssh_access
           info("Setting up public key #{config[:public_key_path]} on #{instance.name}")
-          wait_for_path("/root/.ssh")
+          unless config[:username] == "root"
+             create_ssh_user
+             info("Checking /home/#{config[:username]}/.ssh on #{instance.name}")
+             wait_for_path("/home/#{config[:username]}/.ssh")
+          else
+             info("Check /#{config[:username]}/.ssh on #{instance.name}")
+             wait_for_path("/#{config[:username]}/.ssh")
+          end
 
           begin
             debug("Uploading public key...")
-            `lxc file push #{config[:public_key_path]} #{instance.name}/root/.ssh/authorized_keys 2> /dev/null`
+            unless config[:username] == "root"
+              `lxc file push #{config[:public_key_path]} #{instance.name}/home/#{config[:username]}/.ssh/authorized_keys 2> /dev/null`
+            else
+              `lxc file push #{config[:public_key_path]} #{instance.name}/#{config[:username]}/.ssh/authorized_keys 2> /dev/null`
+            end
             break if $?.to_i == 0
             sleep 0.3
           end while true
@@ -298,6 +311,14 @@ module Kitchen
           debug("Finished Copying public key from #{config[:public_key_path]} to #{instance.name}")
         end
 
+        def create_ssh_user
+          info("Create user #{config[:username]} on #{instance.name}")
+          `lxc exec #{instance.name} -- useradd -m -G sudo #{config[:username]} -s /bin/bash`
+          `lxc exec #{instance.name} -- mkdir /home/#{config[:username]}/.ssh`
+          `lxc exec #{instance.name} -- chown #{config[:username]}:#{config[:username]} /home/#{config[:username]}/.ssh`
+          `lxc exec #{instance.name} -- sh -c "echo '#{config[:username]} ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"`
+        end
+
         def install_proxy
           IO.popen("bash", "w") do |p|
             if config[:lxd_proxy_verify] == true
@@ -364,11 +385,11 @@ module Kitchen
         def wait_for_ssh_login(ip)
           begin
             debug("Trying to login into #{ip} via SSH...")
-            `ssh root@#{ip} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no 'true' > /dev/null 2>&1`
+            `ssh #{config[:username]}@#{ip} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no 'true' > /dev/null 2>&1`
             break if $?.to_i == 0
             sleep 0.3
           end while true
-          debug("SSH is up, able to login at root@#{ip}")
+          debug("SSH is up, able to login at #{config[:username]}@#{ip}")
         end
 
         def run_lxc_command(cmd)

data/lib/kitchen/driver/lxd_cli_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for LxdCli Kitchen driver
-    LXD_CLI_VERSION = "0.1.5"
+    LXD_CLI_VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Braden Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen