neutron-base: drop python3-networking-ovn

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

3 files changed, 0 insertions, 72 deletions

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 846ac9301..3ac8c07fd 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -26,7 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         {% set neutron_base_packages = neutron_base_packages + [
             'python3-networking-baremetal',
             'python3-networking-mlnx',
-            'python3-networking-ovn',
             'python3-networking-sfc',
             'python3-networking-vmware-nsx',
             'python3-openvswitch',
@@ -34,7 +33,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
         {% else %}
         {% set neutron_base_packages = neutron_base_packages + [
-            'python-networking-ovn',
             'python-networking-sfc',
             'python-networking-vmware-nsx',
             'python2-networking-baremetal',
@@ -56,7 +54,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'neutron-server',
             'openvswitch-switch',
             'python3-networking-mlnx',
-            'python3-networking-ovn',
             'python3-networking-sfc',
             'python3-neutron-fwaas',
             'python3-openvswitch',
diff --git a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2
index f3aea0b4e..ef69d42cb 100644
--- a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2
+++ b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2
@@ -7,40 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% 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 footer %}{% endblock %}
 
diff --git a/docker/neutron/neutron-server-ovn/Dockerfile.j2 b/docker/neutron/neutron-server-ovn/Dockerfile.j2
index 9720dc48e..c7454788b 100644
--- a/docker/neutron/neutron-server-ovn/Dockerfile.j2
+++ b/docker/neutron/neutron-server-ovn/Dockerfile.j2
@@ -3,45 +3,10 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
 
-USER root
-
 {% block neutron_server_ovn %}{% endblock %}
 
 {% 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 footer %}{% endblock %}