openstack/kolla-ansible
Code Issues Proposed changes

Load all sections defined in code and conf file

Browse Source 
oslo.config has two method, _groups and list_all_sections. the former
return all sections defined in config file and the latter one return all
sections defined in code.

Change-Id: Ib05a6dffc2463fd30f183ae5bfb3fc20f475a0bc
Closes-Bug: #1639323
This commit is contained in:
Jeffrey Zhang 2016-11-05 02:21:27 +08:00
parent dc7001de4c
commit 6e7d73be16
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

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