From ec65ae43dd459156387ba7aaac7c84c920ed2b91 Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Wed, 19 Feb 2014 14:27:13 -0800 Subject: [PATCH] Make yaml settings more generic --- docker_container_runner/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker_container_runner/utils.py b/docker_container_runner/utils.py index 2daa49e..f0e9168 100644 --- a/docker_container_runner/utils.py +++ b/docker_container_runner/utils.py @@ -1,6 +1,7 @@ import yaml import sys import os +import re import bgtunnel from bgtunnel import SSHTunnelError @@ -12,7 +13,8 @@ def read_appconfig(filename): print "no filename given, or incorrect file" return err - config = yaml.load(stream) + config = yaml.load(os.path.expandvars(re.sub( + r'\%([a-zA-Z0-9\-_]+)',r'\1=$\1', stream.read()))) directives = {} @@ -124,7 +126,7 @@ def read_settings(filename='settings.yml'): print "no filename given, or incorrect file" return err - settings = yaml.load(stream) + settings = yaml.load(os.path.expandvars(stream.read())) items = settings['default'] items['registry_login'] = try_replace_vars(items.get("registry_login", None))