diff options
| author | Chuck Short <charles.short@ericsson.com> | 2017-11-05 13:04:32 -0500 |
|---|---|---|
| committer | Liping Mao (limao) <limao@cisco.com> | 2018-05-26 07:35:29 +0800 |
| commit | 1e404202771a35f610c754e0a9a4cd718dc68f01 (patch) | |
| tree | 5e0fc4cb41ed6e6f0471b3fd73f5ac22b09ccff4 /docker | |
| parent | 6cd7161a7f785abd817e1743f60341acebbdb697 (diff) | |
| download | kolla-1e404202771a35f610c754e0a9a4cd718dc68f01.tar.gz kolla-1e404202771a35f610c754e0a9a4cd718dc68f01.zip | |
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 <charles.short@ericsson.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | 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 09f344a00..9470375cf 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 20ba01997..377f72e84 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' ] %} |