From e516ddc0b05826f13d3081a45557d2b8d6a40295 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Fri, 29 Aug 2014 11:20:32 -0700 Subject: [PATCH 1/2] Add 'domain' config example --- vmpooler.yaml.example | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vmpooler.yaml.example b/vmpooler.yaml.example index 4e877d2..a8ffc8c 100644 --- a/vmpooler.yaml.example +++ b/vmpooler.yaml.example @@ -98,6 +98,9 @@ # - vm_lifetime # How long (in hours) to keep VMs in 'running' queues before destroying. # (optional; default: '24') +# +# - domain +# If set, returns a top-level 'domain' JSON key in POST requests # Example: @@ -107,6 +110,7 @@ task_limit: 10 vm_checktime: 15 vm_lifetime: 12 + domain: 'company.com' # :pools: # From 5ed275662838a1fc4f306ed2922add1f995e2ed2 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Fri, 29 Aug 2014 11:38:06 -0700 Subject: [PATCH 2/2] Return a 'domain' JSON key if configured --- lib/vmpooler/api.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb index dd1cfb7..3a38fd8 100644 --- a/lib/vmpooler/api.rb +++ b/lib/vmpooler/api.rb @@ -221,6 +221,10 @@ module Vmpooler result['ok'] = false end + if ( result['ok'] and $config[:config]['domain'] ) + result['domain'] = $config[:config]['domain'] + end + JSON.pretty_generate(result) end @@ -285,6 +289,10 @@ module Vmpooler result['ok'] = false end + if ( result['ok'] and $config[:config]['domain'] ) + result['domain'] = $config[:config]['domain'] + end + JSON.pretty_generate(result) end