From 0a024d9d7abe23791edd5b76a36bd5dff53064c3 Mon Sep 17 00:00:00 2001
From: liyingjun <yingjun.li@kylin-cloud.com>
Date: Mon, 19 Sep 2016 14:40:43 +0800
Subject: [PATCH] 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
---
ansible/roles/neutron/templates/neutron.conf.j2 | 2 +-
docker/neutron/neutron-server/Dockerfile.j2 | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index 99b2a7295a..51e6ca2de2 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -35,7 +35,7 @@ host = {{ ansible_hostname }}_{{ item }}
allow_overlapping_ips = true
core_plugin = ml2
-service_plugins = router{% if enable_neutron_lbaas | bool %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if enable_neutron_qos | bool %},qos{% endif %}{% if enable_neutron_vpnaas | bool %},vpnass{% endif %}{% if neutron_plugin_agent == "sfc" %}flow_classifier,sfc{% endif %}
+service_plugins = router{% if enable_neutron_lbaas | bool %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if enable_neutron_qos | bool %},qos{% endif %}{% if enable_neutron_vpnaas | bool %},neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin{% endif %}{% if neutron_plugin_agent == "sfc" %}flow_classifier,sfc{% endif %}
{% if enable_neutron_agent_ha | bool %}
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 40016be5e9..8a121efebf 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 %}