diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-08-16 15:13:03 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-08-16 16:07:28 +0200 |
| commit | c323c5be7fd4ebcc71ca4e10a5c15b9ab1f29ba6 (patch) | |
| tree | 0af882ee5b5484182a5144e130c1b94d62fa8ef1 /docker | |
| parent | 0ffd3aefda90fd7206f4b0989ff17ace414423fe (diff) | |
| download | kolla-c323c5be7fd4ebcc71ca4e10a5c15b9ab1f29ba6.tar.gz kolla-c323c5be7fd4ebcc71ca4e10a5c15b9ab1f29ba6.zip | |
Add pciutils package to cyborg-agent and zun-compute
These run lspci and have this requirement in respective bindeps.
CentOS images seem to have it installed but Ubuntu not.
Ensure pciutils package is always installed.
zun-compute seemed to work nonetheless but generated errors
about being unable to take host inventory.
cyborg-agent is unknown to work at all and deb is unbuildable.
Change-Id: Iebc1f2c05c1f57c2b6f98ca9772f1ae9d9a420fa
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Diffstat (limited to 'docker')
| -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 |