From 1e404202771a35f610c754e0a9a4cd718dc68f01 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Sun, 5 Nov 2017 13:04:32 -0500 Subject: [PATCH] Use real package name In the mitaka cycle, the Ubuntu neutron plugin packages were renamed, and transitional packages were created. Use the real name of the linuxbridge plugin package to reflect reality. Change-Id: I12e1ee45b7a9cfee0d42ba66a34d2e5f4267ca2e Signed-off-by: Chuck Short --- docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 2 +- docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 09f344a004..9470375cfe 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set neutron_linuxbridge_agent_packages = [ 'ebtables', - 'neutron-plugin-linuxbridge-agent' + 'neutron-linuxbridge-agent' ] %} {% endif %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 20ba01997b..377f72e845 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_distro in ['debian', 'ubuntu'] %} {% set neutron_openvswitch_agent_packages = [ - 'neutron-plugin-openvswitch-agent', + 'neutron-openvswitch-agent', 'openvswitch-switch' ] %}