kitchen-lxd_sling 0.5.4 → 0.5.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kitchen/driver/lxd.rb +9 -6
- data/lib/kitchen/driver/lxd_version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c161d6414dddd8f1890566820f74100dd193dcf8de5d0e0aafc1c1a6283283c2
|
|
4
|
+
data.tar.gz: 19431e482ef2cbf343d5b996607750c98ffdf3dbe6455c412255b4583a486686
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a4e2ed018b6c27522adfa0ab5da696c90247e6d22b3326a1a63d57e4967e4ba98ab5ee1f221d185df36805f9f18486960879b18d1fd28db6591d65c4d11537eb
|
|
7
|
+
data.tar.gz: b55ec846f166f11c92bdc58cd514566a887e31920ab9ec66360a1e5429d92e60538edd7f0ba3b6d5fba9d0f0102a56eaa3c06d55f89a7a8c0f4a15ab07097f7f
|
data/lib/kitchen/driver/lxd.rb
CHANGED
|
@@ -50,8 +50,6 @@ module Kitchen
|
|
|
50
50
|
# 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
|
|
51
51
|
# think ahead for default behaviour once LXD can port forward
|
|
52
52
|
# FUTURE: If I get time I'll look into faking a port forward with something under /dev/ until then
|
|
53
|
-
info "Waiting for an IP address..."
|
|
54
|
-
state[:ip_address] = state[:hostname] = container_ip(state)
|
|
55
53
|
if use_ssh?
|
|
56
54
|
# Normalize [:ssh_login]
|
|
57
55
|
config[:ssh_login] = { username: config[:ssh_login] } if config[:ssh_login].is_a? String
|
|
@@ -59,12 +57,17 @@ module Kitchen
|
|
|
59
57
|
|
|
60
58
|
state[:username] = config[:ssh_login][:username] if config[:ssh_login].key? :username
|
|
61
59
|
state[:username] ||= "root"
|
|
60
|
+
end
|
|
62
61
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
62
|
+
if (state[:username] != "root") && cloud_image?
|
|
63
|
+
info "Waiting for cloud-init..."
|
|
64
|
+
driver.wait_for state[:container_name], :cloud_init
|
|
65
|
+
else
|
|
66
|
+
info "Waiting for an IP address..."
|
|
67
|
+
end
|
|
68
|
+
state[:ip_address] = state[:hostname] = container_ip(state)
|
|
67
69
|
|
|
70
|
+
if use_ssh?
|
|
68
71
|
setup_ssh(state[:username], config[:ssh_login][:public_key] || "#{ENV['HOME']}/.ssh/id_rsa.pub", state)
|
|
69
72
|
info "SSH access enabled on #{state[:ip_address]}"
|
|
70
73
|
else
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kitchen-lxd_sling
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean Zachariasen
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-04-
|
|
11
|
+
date: 2018-04-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: lxd-common
|