diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-12-02 00:04:11 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-12-02 07:00:31 +0000 |
| commit | f49afa1b660576b2eb645c34ad91a012cb24eabd (patch) | |
| tree | eb4a4d5434afc7cad116560ec118c68f5518d96c /docker | |
| parent | 8b57bb070e03f07c27c8370c70e2a3bb79f76660 (diff) | |
| download | kolla-f49afa1b660576b2eb645c34ad91a012cb24eabd.tar.gz kolla-f49afa1b660576b2eb645c34ad91a012cb24eabd.zip | |
Add qemu-img into glance api image
Change-Id: I564fd3cdd1c7e48657270510a195e397c7812817
Closes-Bug: #1646535
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 51693533d..352853694 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -3,6 +3,16 @@ MAINTAINER {{ maintainer }} {% block glance_api_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set glance_api_packages = ['qemu-img'] %} +{% elif base_distro in ['ubuntu'] %} + {% set glance_api_packages = ['qemu-utils'] %} +{% endif %} + +{{ macros.install_packages(glance_api_packages | customizable("packages")) }} + COPY extend_start.sh /usr/local/bin/kolla_glance_extend_start RUN chmod 755 /usr/local/bin/kolla_glance_extend_start |