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 #88 from cthorn42/maint/master/no_config_file_non_vmpooler_service_fix

Browse source 
(maint) Fix using ABS service without a .vmfloaty.yml file
This commit is contained in:
mattkirby 2020-08-20 14:00:48 -07:00 • committed by GitHub
commit 5436f54258
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/vmfloaty/utils.rb
View file

@ -206,6 +206,9 @@ class Utils
# If the service is configured but some values are missing, use the top-level defaults to fill them in # If the service is configured but some values are missing, use the top-level defaults to fill them in
service_config.merge! config['services'][options.service] service_config.merge! config['services'][options.service]
end end
# No config file but service is declared on command line
elsif !config['services'] && options.service
service_config['type'] = options.service
end end
# Prioritize an explicitly specified url, user, or token if the user provided one # Prioritize an explicitly specified url, user, or token if the user provided one