Merge pull request #169 from sschneid/dockerfile

Containerize vmpooler
This commit is contained in:
Rick Bradley 2016-12-20 13:43:51 -06:00 committed by GitHub
commit 2bf7c4a715
3 changed files with 47 additions and 6 deletions

View file

@ -21,11 +21,18 @@ module Vmpooler
end
def self.config(filepath='vmpooler.yaml')
# Load the configuration file
config_file = File.expand_path(filepath)
parsed_config = YAML.load_file(config_file)
parsed_config = {}
# Set some defaults
if ENV['VMPOOLER_CONFIG']
# Load configuration from ENV
parsed_config = YAML.load(ENV['VMPOOLER_CONFIG'])
else
# Load the configuration file from disk
config_file = File.expand_path(filepath)
parsed_config = YAML.load_file(config_file)
end
# Set some configuration defaults
parsed_config[:redis] ||= {}
parsed_config[:redis]['server'] ||= 'localhost'
parsed_config[:redis]['data_ttl'] ||= 168