diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-01-15 15:48:28 +0000 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-02-12 06:00:20 +0000 |
| commit | 477fc18bd0febb2d53c0c5053ccff76ae1589d25 (patch) | |
| tree | b3af58dd851cc6532c3b6fae500cde79fb771562 /kolla/tests/docker | |
| parent | 013d21119f5cd2283c21e0b5d1d668fb2f44dbd3 (diff) | |
| download | kolla-477fc18bd0febb2d53c0c5053ccff76ae1589d25.tar.gz kolla-477fc18bd0febb2d53c0c5053ccff76ae1589d25.zip | |
Fix image plugin functionality for oslo.config
The new oslo.config style parsing for kolla-build.conf stopped plugins
from working. This patch fixes it and adds a unit test.
Co-Authored-By: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Closes-Bug: 1534556
Change-Id: I135797c733ae0cae040a009c364073769b19e4eb
Diffstat (limited to 'kolla/tests/docker')
| -rw-r--r-- | kolla/tests/docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | kolla/tests/docker/neutron-server/Dockerfile.j2 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/kolla/tests/docker/base/Dockerfile.j2 b/kolla/tests/docker/base/Dockerfile.j2 new file mode 100644 index 000000000..ef5d2105a --- /dev/null +++ b/kolla/tests/docker/base/Dockerfile.j2 @@ -0,0 +1 @@ +FROM {{ base_distro }}:{{ base_distro_tag }} diff --git a/kolla/tests/docker/neutron-server/Dockerfile.j2 b/kolla/tests/docker/neutron-server/Dockerfile.j2 new file mode 100644 index 000000000..ae637eec4 --- /dev/null +++ b/kolla/tests/docker/neutron-server/Dockerfile.j2 @@ -0,0 +1 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} |