openstack/kolla
Code Issues Proposed changes

neutron-base: drop python3-networking-ovn

Browse Source 
This code is now part of neutron, as part of ML2/OVS convergence
with OVN work [1].

[1]: https://blueprints.launchpad.net/neutron/+spec/neutron-ovn-merge

Change-Id: I704d231ead35cf94a712a5bccdd7a427c46077c7
This commit is contained in:
Marcin Juszkiewicz 2020-03-12 19:31:24 +01:00 committed by Michal Nasiadka
parent 5498671b34
commit 7f0baa6e2c
3 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -26,7 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set neutron_base_packages = neutron_base_packages + [ {% set neutron_base_packages = neutron_base_packages + [
'python3-networking-baremetal', 'python3-networking-baremetal',
'python3-networking-mlnx', 'python3-networking-mlnx',
'python3-networking-ovn',
'python3-networking-sfc', 'python3-networking-sfc',
'python3-networking-vmware-nsx', 'python3-networking-vmware-nsx',
'python3-openvswitch', 'python3-openvswitch',
@ -34,7 +33,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% else %} {% else %}
{% set neutron_base_packages = neutron_base_packages + [ {% set neutron_base_packages = neutron_base_packages + [
'python-networking-ovn',
'python-networking-sfc', 'python-networking-sfc',
'python-networking-vmware-nsx', 'python-networking-vmware-nsx',
'python2-networking-baremetal', 'python2-networking-baremetal',
@ -56,7 +54,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'neutron-server', 'neutron-server',
'openvswitch-switch', 'openvswitch-switch',
'python3-networking-mlnx', 'python3-networking-mlnx',
'python3-networking-ovn',
'python3-networking-sfc', 'python3-networking-sfc',
'python3-neutron-fwaas', 'python3-neutron-fwaas',
'python3-openvswitch', 'python3-openvswitch',

34
docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2
View File

@ -7,40 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% if distro_python_version.startswith('3') %}
{% set neutron_metadata_agent_ovn_packages = [
'python3-networking-ovn-metadata-agent'
] %}
{% else %}
{% set neutron_metadata_agent_ovn_packages = [
'python-networking-ovn-metadata-agent'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set neutron_metadata_agent_ovn_packages = [
'python3-networking-ovn'
] %}
{% endif %}
{{ macros.install_packages(neutron_metadata_agent_ovn_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD plugins-archive /
{% set neutron_metadata_agent_ovn_plugins_pip_packages = [
'/plugins/*'
] %}
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_metadata_agent_ovn_plugins_pip_packages) }}; \
fi
{% endif %}
{% block neutron_metadata_agent_ovn_footer %}{% endblock %} {% block neutron_metadata_agent_ovn_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}

35
docker/neutron/neutron-server-ovn/Dockerfile.j2
View File

@ -3,45 +3,10 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %} {% endblock %}
USER root
{% block neutron_server_ovn %}{% endblock %} {% block neutron_server_ovn %}{% endblock %}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% if distro_python_version.startswith('3') %}
{% set neutron_server_ovn_packages = [
'python3-networking-ovn'
] %}
{% else %}
{% set neutron_server_ovn_packages = [
'python-networking-ovn'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set neutron_server_ovn_packages = [
'python3-networking-ovn',
] %}
{% endif %}
{{ macros.install_packages(neutron_server_ovn_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD plugins-archive /
{% set neutron_server_ovn_plugins_pip_packages = [
'/plugins/*'
] %}
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_server_ovn_plugins_pip_packages) }}; \
fi
{% endif %}
{% block neutron_server_ovn_footer %}{% endblock %} {% block neutron_server_ovn_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}