diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-08 18:19:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-08 18:19:10 +0000 |
| commit | 71489044da447b61b65cc5e22f0020bd57fbc43e (patch) | |
| tree | 0527289dc6b65ae51794e5d0c392e3ed0b0c71fd /docker | |
| parent | 8b7ec43536842dd500cc5ee1198a318070ac1046 (diff) | |
| parent | 17982e5817ccb9e8b20d3c073805c6b9d63b90ec (diff) | |
| download | kolla-71489044da447b61b65cc5e22f0020bd57fbc43e.tar.gz kolla-71489044da447b61b65cc5e22f0020bd57fbc43e.zip | |
Merge "Add OVN bits to neutron-base"
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 |