openstack
/
kolla
Code Issues Proposed changes

Merge "Add pciutils package to cyborg-agent and zun-compute"

This commit is contained in:
Zuul 2019-08-19 17:01:00 +00:00 committed by Gerrit Code Review
parent be2bc66866 c323c5be7f
commit 9d80b28559
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/cyborg/cyborg-agent/Dockerfile.j2
View File

@ -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' %}

8
docker/zun/zun-compute/Dockerfile.j2
View File

@ -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