puppetlabs/vmfloaty
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmfloaty.git synced 2026-01-26 05:28:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #104 from nwolfe/maint/dont-require-fallback-config

Browse source 
(maint) Don't require configuration file for get
This commit is contained in:
Samuel 2020-10-09 14:56:25 -05:00 • committed by GitHub
commit 6d1130bc8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/vmfloaty/abs.rb
View file

@ -249,7 +249,6 @@ class ABS
conn.headers['X-AUTH-TOKEN'] = token if token conn.headers['X-AUTH-TOKEN'] = token if token
saved_job_id = user + "-" + DateTime.now.strftime('%Q') saved_job_id = user + "-" + DateTime.now.strftime('%Q')
vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
req_obj = { req_obj = {
:resources => os_types, :resources => os_types,
:job => { :job => {
@ -258,9 +257,14 @@ class ABS
:user => user, :user => user,
}, },
}, },
:vm_token => vmpooler_config['token'] # request with this token, on behalf of this user
} }
if config['vmpooler_fallback'] # optional and not available as cli flag
vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
# request with this token, on behalf of this user
req_obj[:vm_token] = vmpooler_config['token']
end
if config['priority'] if config['priority']
req_obj[:priority] = if config['priority'] == 'high' req_obj[:priority] = if config['priority'] == 'high'
1 1