aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-04-09 20:56:24 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-04-12 01:18:54 +0000
commit4417571b9bb787288cf8b002b3b244f955b40856 (patch)
tree6b0c308b3fb968ba0d95a8df97fe96edf5ca2718 /docker
parent3cd96ea0ee912a786d3b2d98b3aac0d7dd42119b (diff)
downloadkolla-4417571b9bb787288cf8b002b3b244f955b40856.tar.gz
kolla-4417571b9bb787288cf8b002b3b244f955b40856.zip
Fix the wrong package name in Ubuntu binary build
neutron-plugin-linuxbridge and neutron-plugin-openvswitch package is useless and removed in Mitaka on Ubuntu Change-Id: Ia156d58410198af969f579cd5e7461c31ea63408 Closes-Bug: #1568281
Diffstat (limited to 'docker')
-rw-r--r--docker/neutron/neutron-linuxbridge-agent/Dockerfile.j22
-rw-r--r--docker/neutron/neutron-openvswitch-agent/Dockerfile.j21
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 0abb05447..e7775ecb1 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@@ -14,7 +14,7 @@ RUN yum install -y \
RUN apt-get install -y --no-install-recommends \
ebtables \
- neutron-plugin-linuxbridge \
+ neutron-plugin-linuxbridge-agent \
&& apt-get clean
{% endif %}
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
index 36ee540da..4bac50e18 100644
--- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
@@ -13,7 +13,6 @@ RUN yum install -y \
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
- neutron-plugin-openvswitch \
openvswitch-switch \
neutron-plugin-openvswitch-agent \
&& apt-get clean