openstack/kolla
Code Issues Proposed changes

Merge "neutron-server-opendaylight: make it buildable on non-x86"

Browse Source
This commit is contained in:
Zuul 2017-12-12 21:09:21 +00:00 committed by Gerrit Code Review
commit a38fc244d1
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/neutron/neutron-server-opendaylight/Dockerfile.j2
View File

@ -18,6 +18,20 @@ USER root
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_arch not in ['x86_64'] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_server_opendaylight_packages = [
'libjpeg-devel'
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_server_opendaylight_packages = [
'libjpeg-dev'
] %}
{% endif %}
{{ macros.install_packages(neutron_server_opendaylight_packages | customizable("packages")) }}
{% endif %}
ADD plugins-archive / ADD plugins-archive /
{% set neutron_server_opendaylight_plugins_pip_packages = [ {% set neutron_server_opendaylight_plugins_pip_packages = [