diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-07 13:50:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-07 13:50:54 +0000 |
| commit | 14b5636e0ccef96953416bf80d1251bfa4074638 (patch) | |
| tree | e7f59d4d8d26480a010f060112e94b9b9e0f7806 | |
| parent | b8da31d44841bfca3c03d317add37dc6eea83863 (diff) | |
| parent | 6e7d73be1616fce7d35ec1296dd4a1083dbfdc59 (diff) | |
| download | kolla-14b5636e0ccef96953416bf80d1251bfa4074638.tar.gz kolla-14b5636e0ccef96953416bf80d1251bfa4074638.zip | |
Merge "Load all sections defined in code and conf file"
| -rw-r--r-- | kolla/image/build.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 0e2b87244..7ec842371 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -812,6 +812,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: @@ -834,7 +837,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(), |