diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-04 10:45:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-04 10:45:16 +0000 |
| commit | 3a65b17da7b98c83dbfda432af88bb56d3501de9 (patch) | |
| tree | e2755474a8469334b708f9ab2bdf223dd564ec61 /docker | |
| parent | 5caa5e30de05f5879fe56c3b0cb56329c8116d87 (diff) | |
| parent | 1e404202771a35f610c754e0a9a4cd718dc68f01 (diff) | |
| download | kolla-3a65b17da7b98c83dbfda432af88bb56d3501de9.tar.gz kolla-3a65b17da7b98c83dbfda432af88bb56d3501de9.zip | |
Merge "Use real package name"
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' ] %} |