diff options
| author | liyingjun <yingjun.li@kylin-cloud.com> | 2016-09-19 14:40:43 +0800 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2016-09-19 07:19:00 +0000 |
| commit | 0a024d9d7abe23791edd5b76a36bd5dff53064c3 (patch) | |
| tree | 4fa944ddb87d4857b7bae0eb31ca24cf62a33823 | |
| parent | d75847772d0e880329eef5867caf4b87035d2ae0 (diff) | |
| download | kolla-0a024d9d7abe23791edd5b76a36bd5dff53064c3.tar.gz kolla-0a024d9d7abe23791edd5b76a36bd5dff53064c3.zip | |
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
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 2 | ||||
| -rw-r--r-- | 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 99b2a7295..51e6ca2de 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 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 %} |