summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-09-11 05:41:44 +0000
committerGerrit Code Review <review@openstack.org>2018-09-11 05:41:44 +0000
commit3d4e284e134ece50dcea41eaed98bbaa1320f798 (patch)
tree70dbce164fc2f6d0e71a07f6c4282c8fe8bab6af
parent27bab79096584b50947f0d81d41ad2e143c1041e (diff)
parenta708c7cbbaf6e0cb5a037bb3c3f01cfd7b9c3ab1 (diff)
Merge "Add networking-generic-switch to neutron-server"
-rw-r--r--docker/neutron/neutron-server/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 5bdd03d..e236e2a 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -9,7 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
9 {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} 9 {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
10 10
11 {% set neutron_server_packages = [ 11 {% set neutron_server_packages = [
12 'openstack-neutron-vpnaas' 12 'openstack-neutron-vpnaas',
13 'python-networking-generic-switch',
13 ] %} 14 ] %}
14 15
15 {% elif base_distro in ['debian', 'ubuntu'] %} 16 {% elif base_distro in ['debian', 'ubuntu'] %}