kitchen-lxd_sling 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0dc82025120a8d83e1e12e15e9586bdafd8e93110bcebd6ff6b1f52f408a479
-  data.tar.gz: 65cf4f5ac0cc79748ab65de96fbbaf2875a0f8758594cc4c2979bbefffc915be
+  metadata.gz: c161d6414dddd8f1890566820f74100dd193dcf8de5d0e0aafc1c1a6283283c2
+  data.tar.gz: 19431e482ef2cbf343d5b996607750c98ffdf3dbe6455c412255b4583a486686
 SHA512:
-  metadata.gz: 0bed973a3622bc0bb3f03700417b58a1dd0e6d116fb0436d31fccef7b69834131d5083297720832771fc45269acd63a1753b1865fd3e561a76184c1aa7c39133
-  data.tar.gz: 2d911efe29221d2dcf19bb01c953a2c73b6800f48cb6d94753f23fba4d371bc127c13eecb923bdda9ab3cc801d3e2ffa4be05112f9d8e81f8ac7cb0d1723fea5
+  metadata.gz: a4e2ed018b6c27522adfa0ab5da696c90247e6d22b3326a1a63d57e4967e4ba98ab5ee1f221d185df36805f9f18486960879b18d1fd28db6591d65c4d11537eb
+  data.tar.gz: b55ec846f166f11c92bdc58cd514566a887e31920ab9ec66360a1e5429d92e60538edd7f0ba3b6d5fba9d0f0102a56eaa3c06d55f89a7a8c0f4a15ab07097f7f

data/lib/kitchen/driver/lxd.rb

@@ -50,8 +50,6 @@ module Kitchen
         # Which also means that you might need to do 'ssh_login: false' in the config if you're using a cloud-image and aren't routable
         # think ahead for default behaviour once LXD can port forward
         # FUTURE: If I get time I'll look into faking a port forward with something under /dev/ until then
-        info "Waiting for an IP address..."
-        state[:ip_address] = state[:hostname] = container_ip(state)
         if use_ssh?
           # Normalize [:ssh_login]
           config[:ssh_login] = { username: config[:ssh_login] } if config[:ssh_login].is_a? String
@@ -59,12 +57,17 @@ module Kitchen
 
           state[:username] = config[:ssh_login][:username] if config[:ssh_login].key? :username
           state[:username] ||= "root"
+        end
 
-          if (state[:username] != "root") && cloud_image?
-            info "Waiting for cloud-init..."
-            driver.wait_for state[:container_name], :cloud_init
-          end
+        if (state[:username] != "root") && cloud_image?
+          info "Waiting for cloud-init..."
+          driver.wait_for state[:container_name], :cloud_init
+        else
+          info "Waiting for an IP address..."
+        end
+        state[:ip_address] = state[:hostname] = container_ip(state)
 
+        if use_ssh?
           setup_ssh(state[:username], config[:ssh_login][:public_key] || "#{ENV['HOME']}/.ssh/id_rsa.pub", state)
           info "SSH access enabled on #{state[:ip_address]}"
         else

data/lib/kitchen/driver/lxd_version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Driver
-    LXD_VERSION = "0.5.4".freeze
+    LXD_VERSION = "0.5.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_sling
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Sean Zachariasen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-21 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lxd-common