aboutsummaryrefslogtreecommitdiff
path: root/kolla/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-12 23:58:54 +0000
committerGerrit Code Review <review@openstack.org>2016-06-12 23:58:54 +0000
commit9afb69c8de7422ef94e5daab0c9cc8e4581f6939 (patch)
tree23f76d9b44c0f91f30681d77a7579db3b1a5806c /kolla/common
parent019db8bbfe9f6d49258ccd8ba53d93505c935305 (diff)
parent51074b0a42490d69f653c49aa78a03cb55888ff1 (diff)
downloadkolla-9afb69c8de7422ef94e5daab0c9cc8e4581f6939.tar.gz
kolla-9afb69c8de7422ef94e5daab0c9cc8e4581f6939.zip
Merge "Mechanism for Dockerfile customization"
Diffstat (limited to 'kolla/common')
-rw-r--r--kolla/common/config.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 903fd693d..b1224d09e 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -142,6 +142,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'),
]
_BASE_OPTS = [