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

Merge branch 'pooler_158' of github.com:mattkirby/vmpooler into pooler_158

Browse source
This commit is contained in:
Samuel Beaulieu 2020-05-19 12:33:36 -05:00
commit 5a4093508c
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/API.md
View file

@ -815,6 +815,7 @@ An authentication token is required in order to request instances on demand when
Responses: Responses:
* 201 - Provisioning request accepted * 201 - Provisioning request accepted
* 400 - Payload contains invalid JSON and cannot be parsed
* 403 - Request exceeds the configured per pool maximum * 403 - Request exceeds the configured per pool maximum
* 404 - A pool was requested, which is not available in the running configuration, or an unknown error occurred. * 404 - A pool was requested, which is not available in the running configuration, or an unknown error occurred.
* 409 - A request of the matching ID has already been created * 409 - A request of the matching ID has already been created

1
lib/vmpooler/api/v1.rb
View file

@ -956,7 +956,6 @@ module Vmpooler
result['domain'] = config['domain'] if config['domain'] result['domain'] = config['domain'] if config['domain']
status 200 status 200
elsif request_hash['status'] == 'failed' elsif request_hash['status'] == 'failed'
result['ready'] = false
result['message'] = "The request failed to provision instances within the configured ondemand_request_ttl '#{config['ondemand_request_ttl']}'" result['message'] = "The request failed to provision instances within the configured ondemand_request_ttl '#{config['ondemand_request_ttl']}'"
status 200 status 200
elsif request_hash['status'] == 'deleted' elsif request_hash['status'] == 'deleted'