openstack/kolla
Code Issues Proposed changes

Merge "Support for multiple override files"

Browse Source
This commit is contained in:
Jenkins 2017-01-18 13:21:05 +00:00 committed by Gerrit Code Review
commit b700909824
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kolla/common/config.py
View File

@ -209,8 +209,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.'),

18
kolla/image/build.py
View File

@ -677,11 +677,11 @@ class KollaWorker(object):
template = env.get_template(tpl_path)
if self.conf.template_override:
template_path = os.path.dirname(self.conf.template_override)
template_name = os.path.basename(self.conf.template_override)
tpl_dict = self._merge_overrides(self.conf.template_override)
template_name = os.path.basename(tpl_dict.keys()[0])
values['parent_template'] = template
env = jinja2.Environment( # nosec: not used to render HTML
loader=jinja2.FileSystemLoader(template_path))
loader=jinja2.DictLoader(tpl_dict))
env.filters.update(self._get_filters())
env.globals.update(self._get_methods())
template = env.get_template(template_name)
@ -693,6 +693,18 @@ class KollaWorker(object):
f.write(content)
LOG.debug("Wrote it to %s", content_path)
def _merge_overrides(self, overrides):
tpl_name = os.path.basename(overrides[0])
with open(overrides[0], 'r') as f:
tpl_content = f.read()
for override in overrides[1:]:
with open(override, 'r') as f:
cont = f.read()
# Remove extends header
cont = re.sub(r'.*\{\%.*extends.*\n', '', cont)
tpl_content += cont
return {tpl_name: tpl_content}
def find_dockerfiles(self):
"""Recursive search for Dockerfiles in the working directory"""
self.docker_build_paths = list()