diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-12 21:09:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-12 21:09:21 +0000 |
| commit | a38fc244d1a5dbb0090af60c605d87e449c80388 (patch) | |
| tree | da151a904864250218492bd6c12e214362a47311 | |
| parent | db990589e1fe0a936d624a4d2f1682408651c907 (diff) | |
| parent | 7a170f8930411379923131039831147bdcff1c61 (diff) | |
| download | kolla-a38fc244d1a5dbb0090af60c605d87e449c80388.tar.gz kolla-a38fc244d1a5dbb0090af60c605d87e449c80388.zip | |
Merge "neutron-server-opendaylight: make it buildable on non-x86"
| -rw-r--r-- | docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 index ad317de2f..b59feeb21 100644 --- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -18,6 +18,20 @@ USER root {% 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 / {% set neutron_server_opendaylight_plugins_pip_packages = [ |