diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-11-03 12:31:07 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-11-04 10:27:39 +0000 |
| commit | 5ddba7892df71d23fefbf7116e8cfec11a2f41da (patch) | |
| tree | f33901dbf14755b54c9498a2b6065fe7e746ee30 /kolla/image | |
| parent | dc7001de4cbbf244ec5493d81bfb193a42b2dbe0 (diff) | |
| download | kolla-5ddba7892df71d23fefbf7116e8cfec11a2f41da.tar.gz kolla-5ddba7892df71d23fefbf7116e8cfec11a2f41da.zip | |
Fix plugin parsing for base images
If we try to add a plugin to a base image, e.g.
[neutron-base-plugin-neutron-fwaas]
type = git
location = https://github.com/openstack/neutron-fwaas
reference = master
The build will fail as it parses the above as both
"neutron-base-plugin-neutron-fwaas" and "base-plugin-neutron-fwaas".
Update the regex to ensure the image name is anchored to the beginning of the
conf section.
Change-Id: I4099ebd0d25cd28a9bb3bdc4fcfbf311ce22a3fd
Closes-Bug: #1638900
Diffstat (limited to 'kolla/image')
| -rw-r--r-- | kolla/image/build.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 231824e85..9ad42ab8f 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -836,7 +836,7 @@ class KollaWorker(object): image.name) image.source = process_source_installation(image, image.name) 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 self.conf.list_all_sections()) if match]: try: |