From 1781af8b46b103bc47c57a50f7992240a2dd7bad Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 23 Jul 2020 10:58:10 +0200
Subject: Remove neutron-server-opendaylight image

In [1] we have removed opendaylight image, but left neutron-server-opendaylight
image.

[1]: https://review.opendev.org/#/c/739446/

Change-Id: Iae312e24a4ff9ab79979328abac3410fbb1a3cc2
---
 .../neutron-server-opendaylight/Dockerfile.j2      | 62 ----------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 docker/neutron/neutron-server-opendaylight/Dockerfile.j2

(limited to 'docker')

diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
deleted file mode 100644
index 8f86db6a6..000000000
--- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
+++ /dev/null
@@ -1,62 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-USER root
-
-{% block neutron_server_opendaylight_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set neutron_server_opendaylight_packages = [
-            'python3-networking-bgpvpn',
-            'python3-networking-bgpvpn-heat',
-            'python3-networking-l2gw',
-            'python3-networking-odl'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set neutron_server_opendaylight_packages = [
-            'python3-networking-bgpvpn',
-            'python3-networking-l2gw',
-            'python3-networking-odl'
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(neutron_server_opendaylight_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
-    {% if base_arch not in ['x86_64'] %}
-        {% if base_package_type == 'rpm' %}
-            {% set neutron_server_opendaylight_packages = [
-                'libjpeg-devel'
-            ] %}
-        {% elif base_package_type == 'deb' %}
-            {% set neutron_server_opendaylight_packages = [
-                'libjpeg-dev'
-            ] %}
-        {% endif %}
-
-{{ macros.install_packages(neutron_server_opendaylight_packages | customizable("packages")) }}
-    {% endif %}
-
-ADD plugins-archive /
-
-{% set neutron_server_opendaylight_plugins_pip_packages = [
-    '/plugins/*'
-] %}
-
-RUN if [ "$(ls /plugins)" ]; then \
-        sed -i 's|^ceilometer===.*$||g' requirements/upper-constraints.txt \
-        && {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \
-    fi
-
-{% endif %}
-
-{% block neutron_server_opendaylight_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER neutron
-- 
cgit v1.2.3