From 0a024d9d7abe23791edd5b76a36bd5dff53064c3 Mon Sep 17 00:00:00 2001 From: liyingjun Date: Mon, 19 Sep 2016 14:40:43 +0800 Subject: Fix vpnaas for neutron 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 --- docker/neutron/neutron-server/Dockerfile.j2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 40016be5e..8a121efeb 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -9,15 +9,16 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set neutron_server_packages = [ - 'openstack-neutron-lbaas' + 'openstack-neutron-lbaas', + 'openstack-neutron-vpnaas', ] %} {% elif base_distro in ['ubuntu'] %} {% set neutron_server_packages = [ - 'neutron-lbaas-common', 'neutron-lbaasv2-agent', - 'python-neutron-lbaas' + 'python-neutron-lbaas', + 'python-neutron-vpnaas', ] %} {% endif %} -- cgit v1.2.3