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

(maint) Don't require configuration file for get
puppetlabs · Oct 9, 2020 · 6d1130b · 6d1130b
2 parents e146857 + ad81969
commit 6d1130b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/vmfloaty/abs.rb b/lib/vmfloaty/abs.rb
@@ -249,7 +249,6 @@ def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)
     conn.headers['X-AUTH-TOKEN'] = token if token
 
     saved_job_id = user + "-" + DateTime.now.strftime('%Q')
-    vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
     req_obj = {
       :resources => os_types,
       :job       => {
@@ -258,9 +257,14 @@ def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)
           :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']
       req_obj[:priority] = if config['priority'] == 'high'
                              1