kitchen-digitalocean 0.5.2 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/README.md +11 -0
- data/lib/kitchen/driver/digitalocean.rb +13 -7
- data/lib/kitchen/driver/digitalocean_version.rb +1 -1
- data/spec/kitchen/driver/digitalocean_spec.rb +2 -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: 3ebb82e602775e316d08c72e2a79f468ff378e49
|
4
|
+
data.tar.gz: 1451ce62418adbf49f381b733a42fabfb45ce6c5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 91a784abd06dffbbbb9d222d2723a59946fcbe45af9eeb0c682236551ede2b313f10fca361bfff586c9bc13c9b1762f64bb2116e6337d18d2444351bffc801ac
|
7
|
+
data.tar.gz: 346799457ddb91daf2dc30cb1e6c9faaac8070e55273859afd93cf94b1a50245a719021f09921dadfbf6ca026557394a6db1b85c96343da400db73555c5ede97
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,8 @@
|
|
1
|
+
# 0.6.0 / 2014-3-17
|
2
|
+
|
3
|
+
* Private Networking is now enabled by default. This only works in select regions.
|
4
|
+
* The default region was changed to New York 2, so private networking would work by default.
|
5
|
+
|
1
6
|
# 0.5.2 / 2014-02-20
|
2
7
|
|
3
8
|
* [@lamont-granquist](https://github.com/lamont-granquist) [PR #5] add info on using numeric key ids.
|
data/README.md
CHANGED
@@ -113,6 +113,17 @@ driver:
|
|
113
113
|
|
114
114
|
For specific default values, please consult [digitalocean.json](https://github.com/test-kitchen/kitchen-digitalocean/blob/master/data/digitalocean.json).
|
115
115
|
|
116
|
+
# Private Networking
|
117
|
+
|
118
|
+
Private networking is enabled by default, but will only work in certain regions. You can disable private networking by changing private_networking to
|
119
|
+
false. Example below.
|
120
|
+
|
121
|
+
```ruby
|
122
|
+
---
|
123
|
+
driver:
|
124
|
+
- private_networking: false
|
125
|
+
```
|
126
|
+
|
116
127
|
# Development
|
117
128
|
|
118
129
|
* Source hosted at [GitHub](https://github.com/test-kitchen/kitchen-digitalocean)
|
@@ -31,6 +31,10 @@ module Kitchen
|
|
31
31
|
default_config :username, 'root'
|
32
32
|
default_config :port, '22'
|
33
33
|
|
34
|
+
default_config :private_networking do |driver|
|
35
|
+
true
|
36
|
+
end
|
37
|
+
|
34
38
|
default_config :region_id do |driver|
|
35
39
|
driver.default_region
|
36
40
|
end
|
@@ -96,7 +100,7 @@ module Kitchen
|
|
96
100
|
data['regions'].each_pair do |key, value|
|
97
101
|
regions[key.upcase] = value
|
98
102
|
end
|
99
|
-
regions.fetch(config[:region] ? config[:region].upcase : nil) { '
|
103
|
+
regions.fetch(config[:region] ? config[:region].upcase : nil) { '4' }
|
100
104
|
end
|
101
105
|
|
102
106
|
def default_image
|
@@ -127,18 +131,19 @@ module Kitchen
|
|
127
131
|
debug_server_config
|
128
132
|
|
129
133
|
compute.servers.create(
|
130
|
-
name:
|
131
|
-
image_id:
|
132
|
-
flavor_id:
|
133
|
-
region_id:
|
134
|
-
ssh_key_ids:
|
134
|
+
name: config[:server_name],
|
135
|
+
image_id: config[:image_id],
|
136
|
+
flavor_id: config[:flavor_id],
|
137
|
+
region_id: config[:region_id],
|
138
|
+
ssh_key_ids: config[:ssh_key_ids],
|
139
|
+
private_networking: config[:private_networking]
|
135
140
|
)
|
136
141
|
end
|
137
142
|
|
138
143
|
def data
|
139
144
|
@data ||= begin
|
140
145
|
json_file = File.expand_path(
|
141
|
-
File.join(%w
|
146
|
+
File.join(%w(.. .. .. .. data digitalocean.json)),
|
142
147
|
__FILE__
|
143
148
|
)
|
144
149
|
JSON.load(IO.read(json_file))
|
@@ -151,6 +156,7 @@ module Kitchen
|
|
151
156
|
debug("digitalocean:flavor_id #{config[:flavor_id]}")
|
152
157
|
debug("digitalocean:region_id #{config[:region_id]}")
|
153
158
|
debug("digitalocean:ssh_key_ids #{config[:ssh_key_ids]}")
|
159
|
+
debug("digitalocean:private_networking #{config[:private_networking]}")
|
154
160
|
end
|
155
161
|
|
156
162
|
def debug_compute_config
|
@@ -67,7 +67,7 @@ describe Kitchen::Driver::Digitalocean do
|
|
67
67
|
end
|
68
68
|
|
69
69
|
it 'defaults to region id 1' do
|
70
|
-
expect(driver[:region_id]).to eq('
|
70
|
+
expect(driver[:region_id]).to eq('4')
|
71
71
|
end
|
72
72
|
|
73
73
|
it 'defaults to SSH Key Ids from $SSH_KEY_IDS' do
|
@@ -258,6 +258,7 @@ describe Kitchen::Driver::Digitalocean do
|
|
258
258
|
:image_id => 'there',
|
259
259
|
:flavor_id => '68',
|
260
260
|
:region_id => '3',
|
261
|
+
:private_networking => true,
|
261
262
|
:ssh_key_ids => '1234'
|
262
263
|
}
|
263
264
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kitchen-digitalocean
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Greg Fitzgerald
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-03-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: test-kitchen
|