kitchen-softlayer 0.0.6 → 0.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +3 -1
- data/lib/kitchen/driver/softlayer.rb +9 -1
- data/lib/kitchen/driver/softlayer_version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a682dc5e86608aba4f73514a566c33a5bf3facb3
|
|
4
|
+
data.tar.gz: 97350b99e4b7ece3b87fc0b3a3f54c631d99706e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 89573962a152f004c8a476485017c9836d7504a2dfaf5d563efbf88e7c5ffccb661674677b9cd3a66e0b26062c6bf6ebac3411b5dd031133b2e79740eccf0d14
|
|
7
|
+
data.tar.gz: a4dd15a31f74a36f05c692583a64fae72401d862efeb2b3ef2708abda5c4a80f305454fa45e1695a61152d7961b61daab4ad9d71080dbb51f3ba6caa5d8d2551
|
data/README.md
CHANGED
|
@@ -98,7 +98,7 @@ softlayer_default_domain | ENV['softlayer_default_domain']
|
|
|
98
98
|
server_name | nil | Server Name
|
|
99
99
|
key_name | nil | the label of the uploaded key
|
|
100
100
|
ssh_key| nil | file location of private key
|
|
101
|
-
disable_ssl_validation | false | ssl validation for
|
|
101
|
+
disable_ssl_validation | false | ssl validation for fog softlayer api
|
|
102
102
|
username | 'root' | server's administration user
|
|
103
103
|
password | nil | server's administration password
|
|
104
104
|
port | '22' | ssh port of servef
|
|
@@ -115,6 +115,8 @@ image_id | nil | image name or internal id
|
|
|
115
115
|
ephemeral_storage | nil | storage
|
|
116
116
|
network_components | nil | network
|
|
117
117
|
ssh_timeout | 300 | timeout to ssh when server starting
|
|
118
|
+
ssh_via_hostname | false | use hostname for ssh instead of IP
|
|
119
|
+
alternate_ip | nil | alternate ip address for ssh access
|
|
118
120
|
destroy_wait | true | wait for destroy to complete
|
|
119
121
|
destroy_timeout | 300 | timeout to wait until server destroyed
|
|
120
122
|
account_id | nil | softlayer account id
|
|
@@ -72,6 +72,8 @@ module Kitchen
|
|
|
72
72
|
default_config :vlan, nil
|
|
73
73
|
default_config :private_vlan, nil
|
|
74
74
|
default_config :provision_script, nil
|
|
75
|
+
default_config :ssh_via_hostname, false
|
|
76
|
+
default_config :alternate_ip, nil
|
|
75
77
|
|
|
76
78
|
def create(state)
|
|
77
79
|
config[:server_name] = default_name unless config[:server_name]
|
|
@@ -86,7 +88,13 @@ module Kitchen
|
|
|
86
88
|
end
|
|
87
89
|
info "\n(server ready)"
|
|
88
90
|
tag_server(server)
|
|
89
|
-
|
|
91
|
+
if config[:ssh_via_hostname]
|
|
92
|
+
state[:hostname] = config[:hostname]
|
|
93
|
+
elsif config[:alternate_ip]
|
|
94
|
+
state[:hostname] = config[:alternate_ip]
|
|
95
|
+
else
|
|
96
|
+
state[:hostname] = get_ip(server)
|
|
97
|
+
end
|
|
90
98
|
setup_ssh(server, state)
|
|
91
99
|
wait_for_ssh_key_access(state)
|
|
92
100
|
rescue Fog::Errors::Error, Excon::Errors::Error => ex
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kitchen-softlayer
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Neill Turner
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-12-
|
|
11
|
+
date: 2015-12-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-kitchen
|