diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-23 14:22:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-23 14:22:11 +0000 |
| commit | d2f9101b31efb8692f15c1ddd8f8bb269d300914 (patch) | |
| tree | 3ec84127c2a26044cc5af3232cf7550a4e14fafe /docker | |
| parent | b30b70c07d57366feb630807531bd64534eb6a3e (diff) | |
| parent | 928c4648a4c2cf08c616d74f340c675418ba3385 (diff) | |
| download | kolla-d2f9101b31efb8692f15c1ddd8f8bb269d300914.tar.gz kolla-d2f9101b31efb8692f15c1ddd8f8bb269d300914.zip | |
Merge "ironic-neutron-agent: enable for Debuntu binary"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 index 8f0c72a5b..10cf3d3d5 100644 --- a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 +++ b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 @@ -18,8 +18,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set ironic_neutron_agent_packages = [ + 'ironic-neutron-agent', + ] %} {% endif %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index c7f975fe4..f1c4ee1e8 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -17,6 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set neutron_server_packages = [ + 'python3-ironic-neutron-agent', 'python3-neutron-dynamic-routing', 'python3-neutron-vpnaas' ] %} |