diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2020-01-04 08:18:13 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-01-08 09:37:35 +0100 |
| commit | 17982e5817ccb9e8b20d3c073805c6b9d63b90ec (patch) | |
| tree | 1c968fb74324e38596f25c3fab38707f6bc8de55 /docker | |
| parent | 7c116653e311d2a9ef769bb9227acd0ce9d3ad7a (diff) | |
| download | kolla-17982e5817ccb9e8b20d3c073805c6b9d63b90ec.tar.gz kolla-17982e5817ccb9e8b20d3c073805c6b9d63b90ec.zip | |
Add OVN bits to neutron-base
Currently neutron-server-ovn container does not run db setup for networking-ovn
subproject when bootstrapping - since it uses extend_start from
neutron-server (where networking-ovn is not installed).
Since OVN is being added as in-tree driver to Neutron and there is no
rationale behind supporting separate container images for neutron-server-ovn
and neutron-metadata-agent-ovn, hile networking-ovn driver uses around 1-2MB
of space - this change adds networking-ovn installation to neutron-base image
and deprecates neutron-server-ovn and neutron-metadata-agent-ovn images.
Change-Id: Ib2dbdd7e7d34f56985b7a5b2494c3b89034688cb
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/extend_start.sh | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index f3f5877d7..d29597119 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -22,15 +22,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% if distro_python_version.startswith('3') %} {% set neutron_base_packages = neutron_base_packages + [ - 'python3-networking-sfc', - 'python3-networking-vmware-nsx', 'python3-networking-baremetal', 'python3-networking-mlnx', + 'python3-networking-ovn', + 'python3-networking-sfc', + 'python3-networking-vmware-nsx', 'python3-openvswitch', 'python3-oslo-vmware' ] %} {% else %} {% set neutron_base_packages = neutron_base_packages + [ + 'python-networking-ovn', 'python-networking-sfc', 'python-networking-vmware-nsx', 'python2-networking-baremetal', @@ -51,8 +53,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'neutron-plugin-ml2', 'neutron-server', 'openvswitch-switch', - 'python3-networking-sfc', 'python3-networking-mlnx', + 'python3-networking-ovn', + 'python3-networking-sfc', 'python3-neutron-fwaas', 'python3-openvswitch', 'python3-oslo.vmware' diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index 1a018a1b0..e3af2ef85 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -8,6 +8,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then neutron-db-manage ${OPTS} --subproject neutron-dynamic-routing upgrade head neutron-db-manage ${OPTS} --subproject neutron-fwaas upgrade head neutron-db-manage ${OPTS} --subproject neutron-vpnaas upgrade head + neutron-db-manage ${OPTS} --subproject networking-ovn upgrade head exit 0 fi |