0a024d9d7a
1. Install the missing vpnaas python module in neutron-server Dockerfile 2. Remove duplicated neutron-lbaas-common package from neutron-server, since it is installed in neutron-base 3. Fix service plugin config, it's not vpn`ass` ;)) 'vpnass' -> 'neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin' [1] [1]: https://github.com/openstack/neutron-vpnaas/blob/stable/newton/devstack/settings#L8 Change-Id: I5250b6875d96ef5df9cf39bce10ce072982aa80d Closes-bug: #1625020
41 lines
1.1 KiB
Django/Jinja
41 lines
1.1 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% block neutron_server_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
{% set neutron_server_packages = [
|
|
'openstack-neutron-lbaas',
|
|
'openstack-neutron-vpnaas',
|
|
] %}
|
|
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
|
|
{% set neutron_server_packages = [
|
|
'neutron-lbaasv2-agent',
|
|
'python-neutron-lbaas',
|
|
'python-neutron-vpnaas',
|
|
] %}
|
|
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(neutron_server_packages | customizable("packages")) }}
|
|
|
|
ADD plugins-archive /
|
|
COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \
|
|
&& if [ "$(ls /plugins)" ]; then \
|
|
pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \
|
|
fi
|
|
|
|
{% block neutron_server_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
{{ include_footer }}
|
|
|
|
USER neutron
|