openstack/kolla-ansible
Code Issues Proposed changes

Merge "Load all sections defined in code and conf file"

Browse Source
This commit is contained in:
Jenkins 2016-11-07 13:50:54 +00:00 committed by Gerrit Code Review
commit 14b5636e0c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kolla/image/build.py
View File

@ -812,6 +812,9 @@ class KollaWorker(object):
installation['reference'] = self.conf[section]['reference'] installation['reference'] = self.conf[section]['reference']
return installation return installation
all_sections = (set(six.iterkeys(self.conf._groups)) |
set(self.conf.list_all_sections()))
for path in self.docker_build_paths: for path in self.docker_build_paths:
# Reading parent image name # Reading parent image name
with open(os.path.join(path, 'Dockerfile')) as f: with open(os.path.join(path, 'Dockerfile')) as f:
@ -834,7 +837,7 @@ class KollaWorker(object):
for plugin in [match.group(0) for match in for plugin in [match.group(0) for match in
(re.search('^{}-plugin-.+'.format(image.name), (re.search('^{}-plugin-.+'.format(image.name),
section) for section in section) for section in
self.conf.list_all_sections()) if match]: all_sections) if match]:
try: try:
self.conf.register_opts( self.conf.register_opts(
common_config.get_source_opts(), common_config.get_source_opts(),