openstack
/
kolla
Code Issues Proposed changes

Merge "Added python3 packages for mellanox agent container"

This commit is contained in:
Zuul 2019-12-06 21:05:13 +00:00 committed by Gerrit Code Review
parent ce0fe598aa 14f3cd2c32
commit 3bd681a203
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
docker/neutron/neutron-mlnx-agent/Dockerfile.j2
View File

@ -5,37 +5,40 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if base_package_type == 'rpm' %}
{% if distro_python_version.startswith('3') %}
{% set neutron_mlnx_agent_packages = [
'python3-libvirt',
'python3-ethtool',
] %}
{% else %}
{% set neutron_mlnx_agent_packages = [
'libvirt-python',
'python-ethtool',
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_mlnx_agent_packages = [
'python-libvirt',
'python-ethtool',
] %}
{% endif %}
{% if install_type == 'binary' %}
{% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
'python-networking-mlnx'
] %}
{% if distro_python_version.startswith('3') %}
{% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
'python3-networking-mlnx'
] %}
{% else %}
{% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
'python-networking-mlnx'
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if install_type == 'source' %}
{% set neutron_mlnx_agent_pip_packages = [
'networking-mlnx'
] %}
{{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }}
RUN {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }}
{% endif %}