diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-19 17:01:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-19 17:01:00 +0000 |
| commit | 9d80b285594768ac151a8e04c2217a46ece63a2e (patch) | |
| tree | 7096b2d26ec4ebbade78dfae74719960e3e2f6d5 | |
| parent | be2bc668667b623f580af2a28fe7caaa15ef06b8 (diff) | |
| parent | c323c5be7fd4ebcc71ca4e10a5c15b9ab1f29ba6 (diff) | |
| download | kolla-9d80b285594768ac151a8e04c2217a46ece63a2e.tar.gz kolla-9d80b285594768ac151a8e04c2217a46ece63a2e.zip | |
Merge "Add pciutils package to cyborg-agent and zun-compute"
| -rw-r--r-- | docker/cyborg/cyborg-agent/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/zun/zun-compute/Dockerfile.j2 | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2 index 398e6b298..edd67e2b9 100644 --- a/docker/cyborg/cyborg-agent/Dockerfile.j2 +++ b/docker/cyborg/cyborg-agent/Dockerfile.j2 @@ -4,6 +4,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block cyborg_agent_header %}{% endblock %} {% import "macros.j2" as macros with context %} +{% set cyborg_agent_packages = [ + 'pciutils', +] %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ @@ -17,6 +21,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} +{{ macros.install_packages(cyborg_agent_packages | customizable("packages")) }} + RUN {{ macros.install_pip(cyborg_agent_pip_packages | customizable("pip_packages")) }} {% if base_package_type == 'rpm' %} diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 index 33061893b..0d8d385c8 100644 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ b/docker/zun/zun-compute/Dockerfile.j2 @@ -3,6 +3,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block zun_compute_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ @@ -10,6 +12,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} +{% set zun_compute_packages = [ + 'pciutils', +] %} + +{{ macros.install_packages(zun_compute_packages | customizable("packages")) }} + COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start |