kitchen-softlayer 0.0.1 → 0.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +5 -1
- data/kitchen-softlayer.gemspec +1 -1
- data/lib/kitchen/driver/softlayer.rb +8 -3
- data/lib/kitchen/driver/softlayer_version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e44a5783e05b9286591d821314810a2a02ffb34b
|
4
|
+
data.tar.gz: 1d363218e182ec5f95ce36abeb61479aecdbd73a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2983c4cba5a69f4316a8d33378c019a81387fdd8e8f249ca4afd2fd158839bcd039da57759661f7365c5e980e40f60fca7a0fa36ef9bbd85876a48beca590f09
|
7
|
+
data.tar.gz: 37801e1b1992e929b64203a8c5f062b620aa4e3968798cd262df55afadd944ee7ceba037f88361064d777b7b8bd2c24511e77cfdf52d392540cb4e580ae8a013
|
data/README.md
CHANGED
@@ -121,11 +121,15 @@ single_tenant | false | don't share server
|
|
121
121
|
global_identifier | nil | softlayer global id
|
122
122
|
hourly_billing_flag | true
|
123
123
|
tags | [] | tags for the server
|
124
|
-
private_network_only |
|
124
|
+
private_network_only | false | if only a private network
|
125
|
+
use_private_ip_with_public_network | false | otherwise uses public ip
|
125
126
|
user_data | nil | user data for server
|
126
127
|
uid | nil | softlayer global id
|
127
128
|
vlan | nil | numeric id of private_vlan for server
|
128
129
|
private_vlan | nil | numeric id of private_vlan for server
|
130
|
+
provision_script | nil | url of provision script to run
|
131
|
+
|
132
|
+
NOTE: provision_script parameter needs pull request [#73](https://github.com/fog/fog-softlayer/pull/73)
|
129
133
|
|
130
134
|
## Contributing
|
131
135
|
|
data/kitchen-softlayer.gemspec
CHANGED
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
|
|
11
11
|
spec.email = ['neillwturner@gmail.com']
|
12
12
|
spec.description = 'A Test Kitchen Softlayer driver'
|
13
13
|
spec.summary = 'Test Kitchen Softlayer driver'
|
14
|
-
spec.homepage = 'https://github.com/
|
14
|
+
spec.homepage = 'https://github.com/neillturner/kitchen-softlayer'
|
15
15
|
spec.license = 'Apache'
|
16
16
|
candidates = Dir.glob('{lib}/**/*') + ['README.md', 'LICENSE.txt']
|
17
17
|
candidates += ['CHANGELOG.md', 'kitchen-softlayer.gemspec']
|
@@ -62,12 +62,14 @@ module Kitchen
|
|
62
62
|
default_config :global_identifier, nil
|
63
63
|
default_config :hourly_billing_flag, true
|
64
64
|
default_config :tags, nil
|
65
|
-
default_config :private_network_only,
|
65
|
+
default_config :private_network_only, false
|
66
|
+
default_config :use_private_ip_with_public_network, false
|
66
67
|
default_config :user_data, nil
|
67
68
|
default_config :uid, nil
|
68
69
|
default_config :tags, []
|
69
70
|
default_config :vlan, nil
|
70
71
|
default_config :private_vlan, nil
|
72
|
+
default_config :provision_script, nil
|
71
73
|
|
72
74
|
def create(state)
|
73
75
|
config[:server_name] = default_name unless config[:server_name]
|
@@ -183,7 +185,8 @@ module Kitchen
|
|
183
185
|
:user_data,
|
184
186
|
:uid,
|
185
187
|
:vlan,
|
186
|
-
:private_vlan
|
188
|
+
:private_vlan,
|
189
|
+
:provision_script
|
187
190
|
].each do |c|
|
188
191
|
server_def[c] = optional_config(c) if config[c]
|
189
192
|
end
|
@@ -242,7 +245,9 @@ module Kitchen
|
|
242
245
|
pub[config[:public_ip_order].to_i] ||
|
243
246
|
priv[config[:private_ip_order].to_i] ||
|
244
247
|
fail(ActionFailed, 'Could not find an IP')
|
245
|
-
if config[:private_network_only]
|
248
|
+
if config[:use_private_ip_with_public_network] && !config[:private_network_only]
|
249
|
+
return priv[0]
|
250
|
+
elsif config[:private_network_only]
|
246
251
|
return priv[0]
|
247
252
|
else
|
248
253
|
return pub[0]
|
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.2
|
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-09-
|
11
|
+
date: 2015-09-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: test-kitchen
|
@@ -65,7 +65,7 @@ files:
|
|
65
65
|
- kitchen-softlayer.gemspec
|
66
66
|
- lib/kitchen/driver/softlayer.rb
|
67
67
|
- lib/kitchen/driver/softlayer_version.rb
|
68
|
-
homepage: https://github.com/
|
68
|
+
homepage: https://github.com/neillturner/kitchen-softlayer
|
69
69
|
licenses:
|
70
70
|
- Apache
|
71
71
|
metadata: {}
|