Skip to content

Commit 6d1130b

Browse files
author
Samuel
authored
Merge pull request #104 from nwolfe/maint/dont-require-fallback-config
(maint) Don't require configuration file for get
2 parents e146857 + ad81969 commit 6d1130b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Diff for: lib/vmfloaty/abs.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)
249249
conn.headers['X-AUTH-TOKEN'] = token if token
250250

251251
saved_job_id = user + "-" + DateTime.now.strftime('%Q')
252-
vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
253252
req_obj = {
254253
:resources => os_types,
255254
:job => {
@@ -258,9 +257,14 @@ def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)
258257
:user => user,
259258
},
260259
},
261-
:vm_token => vmpooler_config['token'] # request with this token, on behalf of this user
262260
}
263261

262+
if config['vmpooler_fallback'] # optional and not available as cli flag
263+
vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
264+
# request with this token, on behalf of this user
265+
req_obj[:vm_token] = vmpooler_config['token']
266+
end
267+
264268
if config['priority']
265269
req_obj[:priority] = if config['priority'] == 'high'
266270
1

0 commit comments

Comments
 (0)