gaptool-server 0.8.1 → 0.8.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/routes.rb +2 -0
- data/test/api_test.rb +15 -4
- 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: acb18904b52ada4b97f260049347f4b31369a539
|
4
|
+
data.tar.gz: b147d771e2bee618239ce46c766f6618e386b197
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1e9507428e6b1eb2bb0b6ca231c99a38912d94c31f0a7698b53d09ad2aa4daa5734c4acc1747ef3f35c442670fc618b3f8c03df1f8f4258e0bbb3136c345b2b0
|
7
|
+
data.tar.gz: 58c46d2d01fa4d1a1d7ea888f8ce33e61558dc4e5f469e9016e4e1103f25dfad00533309d82b4b9805016cea3da9655abb8b659af5bdeaff737e88d5941dec8a
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.8.
|
1
|
+
0.8.2
|
data/lib/routes.rb
CHANGED
@@ -104,6 +104,8 @@ module Gaptool
|
|
104
104
|
initkey = Gaptool::Data.get_config('initkey')
|
105
105
|
jdata = Gaptool::Data.server_chef_json(instance_id, env,
|
106
106
|
'identity': initkey)
|
107
|
+
# force runlist
|
108
|
+
jdata['run_list'] ||= Gaptool::Data.default_runlist
|
107
109
|
|
108
110
|
erb :init, locals: {
|
109
111
|
initkey: initkey,
|
data/test/api_test.rb
CHANGED
@@ -56,7 +56,7 @@ describe 'Test API' do
|
|
56
56
|
end
|
57
57
|
|
58
58
|
def expanded_runlist
|
59
|
-
['
|
59
|
+
['role[base]', 'recipe[myrecipe]']
|
60
60
|
end
|
61
61
|
|
62
62
|
def version
|
@@ -190,14 +190,14 @@ describe 'Test API' do
|
|
190
190
|
end
|
191
191
|
|
192
192
|
it 'should remove default runlist' do
|
193
|
-
id = add_and_register_server(host_data.merge('chef_runlist' => ['
|
193
|
+
id = add_and_register_server(host_data.merge('chef_runlist' => ['role[base]']))['instance']
|
194
194
|
get "/host/testrole/testenv/#{id}"
|
195
195
|
resp = JSON.parse(last_response.body)
|
196
196
|
expect(resp.keys).not_to include('chef_runlist')
|
197
197
|
end
|
198
198
|
|
199
199
|
it 'should remove default runlist from role' do
|
200
|
-
DH.save_role_data(host_data['role'], chef_runlist: ['
|
200
|
+
DH.save_role_data(host_data['role'], chef_runlist: ['role[base]'].to_json)
|
201
201
|
id = add_and_register_server(host_data.reject { |k, _v| k == 'chef_runlist' })['instance']
|
202
202
|
get "/host/testrole/testenv/#{id}"
|
203
203
|
resp = JSON.parse(last_response.body)
|
@@ -280,6 +280,17 @@ describe 'Test API' do
|
|
280
280
|
expect(last_response.body).to include("-E #{host_data['environment']}")
|
281
281
|
end
|
282
282
|
|
283
|
+
it 'should init with the default runlist' do
|
284
|
+
hdata = host_data.select{ |k, _v| k != 'chef_runlist' }
|
285
|
+
add_and_register_server(hdata)
|
286
|
+
expect(last_response.body).to include('"run_list":["role[base]"],')
|
287
|
+
end
|
288
|
+
|
289
|
+
it 'should init with the host runlist' do
|
290
|
+
add_and_register_server
|
291
|
+
expect(last_response.body).to include('"run_list":["role[base]","recipe[myrecipe]"],')
|
292
|
+
end
|
293
|
+
|
283
294
|
it 'should not find any hosts' do
|
284
295
|
post '/init', host_data.to_json
|
285
296
|
expect(last_response.status).to eq(200)
|
@@ -390,7 +401,7 @@ describe 'Test API' do
|
|
390
401
|
'migrate' => false,
|
391
402
|
'role' => host_data['role'],
|
392
403
|
'rollback' => false,
|
393
|
-
'run_list' =>
|
404
|
+
'run_list' => expanded_runlist
|
394
405
|
)
|
395
406
|
end
|
396
407
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gaptool-server
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Matt Bailey
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2016-01-
|
13
|
+
date: 2016-01-04 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: sinatra
|