aboutsummaryrefslogtreecommitdiff
path: root/kolla/common
diff options
context:
space:
mode:
authorMichal (inc0) Jastrzebski <inc007@gmail.com>2017-01-05 22:05:30 +0000
committerMichal (inc0) Jastrzebski <inc007@gmail.com>2017-01-06 17:33:40 +0000
commitfebfd4e71ab0d1aed65ce92a8004b00e36cc7d60 (patch)
tree720838fe070ca6e1bdb523f8cf4326a89c4df99d /kolla/common
parentf7a1831aad0681ec098a0decedb80ccc6b80a826 (diff)
downloadkolla-febfd4e71ab0d1aed65ce92a8004b00e36cc7d60.tar.gz
kolla-febfd4e71ab0d1aed65ce92a8004b00e36cc7d60.zip
Support for multiple override files
To use multiple override files run --template-override f1 --template-override f2. One caveat is it won't work well if both modify same variable/block. One will override another, so if both overrides tries to add pkg to horizon tpl, only second package gets installed Change-Id: I8d2937c2dad83d3ec94efa6d9c9849a922c0cef6
Diffstat (limited to 'kolla/common')
-rwxr-xr-xkolla/common/config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 8be553b10..c2d8a5e0a 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -203,8 +203,8 @@ _CLI_OPTS = [
help=("Don't build images. Generate Dockerfile only")),
cfg.IntOpt('timeout', default=120,
help='Time in seconds after which any operation times out'),
- cfg.StrOpt('template-override',
- help='Path to template override file'),
+ cfg.MultiOpt('template-override', types.String(),
+ help='Path to template override file'),
cfg.StrOpt('logs-dir', help='Path to logs directory'),
cfg.BoolOpt('pull', default=True,
help='Attempt to pull a newer version of the base image.'),