diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-02 16:03:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-02 16:03:25 +0000 |
| commit | 0ba790762b5b441ae02181fe6ba0a177ce271d6e (patch) | |
| tree | e163cd074096a16ff02844527747a62faf24a790 /docker | |
| parent | f2a8ea61d59d8c2ffc1a14d764018e92a5c7d671 (diff) | |
| parent | f49afa1b660576b2eb645c34ad91a012cb24eabd (diff) | |
| download | kolla-0ba790762b5b441ae02181fe6ba0a177ce271d6e.tar.gz kolla-0ba790762b5b441ae02181fe6ba0a177ce271d6e.zip | |
Merge "Add qemu-img into glance api image"
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 |