diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-19 08:45:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-19 08:45:13 +0000 |
| commit | 25f2eb62f01a9fcf0d5706257a339760c8e5e1d9 (patch) | |
| tree | 6749c3963b8e054fe0ff2ea53454dbedc3f52de0 /docker | |
| parent | 42358d359b1e0c939f3f16cc0eb894b63e899d1f (diff) | |
| parent | 0a024d9d7abe23791edd5b76a36bd5dff53064c3 (diff) | |
| download | kolla-25f2eb62f01a9fcf0d5706257a339760c8e5e1d9.tar.gz kolla-25f2eb62f01a9fcf0d5706257a339760c8e5e1d9.zip | |
Merge "Fix vpnaas for neutron"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 7 |
1 files changed, 4 insertions, 3 deletions
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 %} |