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

4 files changed, 4 insertions, 80 deletions

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
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 6983e44e8..76f2fd577 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -63,7 +63,6 @@ _PROFILE_OPTS = [
                     'logstash',
                     'mariadb',
                     'memcached',
-                    'opendaylight',
                     'openvswitch',
                     'ptp',
                     'qdrouterd',
@@ -582,22 +581,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/neutron-dynamic-routing/'
                      'neutron-dynamic-routing-${openstack_branch}.tar.gz')},
-    'neutron-server-opendaylight-plugin-networking-odl': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/networking-odl/'
-                     'networking-odl-${openstack_branch}.tar.gz')},
-    'neutron-server-opendaylight-plugin-networking-bgpvpn': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/networking-bgpvpn/'
-                     'networking-bgpvpn-${openstack_branch}.tar.gz')},
-    'neutron-server-opendaylight-plugin-networking-l2gw': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/networking-l2gw/'
-                     'networking-l2gw-${openstack_branch}.tar.gz')},
-    'neutron-server-opendaylight-plugin-networking-sfc': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/networking-sfc/'
-                     'networking-sfc-${openstack_branch}.tar.gz')},
     'neutron-server-plugin-neutron-dynamic-routing': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/neutron-dynamic-routing/'
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 5cdcbd233..ca5a0f0cd 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -166,7 +166,6 @@ UNBUILDABLE_IMAGES = {
         "ec2-api",
         "heat-all",
         "ironic-neutron-agent",
-        "neutron-server-opendaylight",
         "nova-serialproxy",
         "novajoin-base",
         "senlin-conductor",  # no binary package
diff --git a/releasenotes/notes/remove-neutron-server-opendaylight-6cacd3936c0dc91e.yaml b/releasenotes/notes/remove-neutron-server-opendaylight-6cacd3936c0dc91e.yaml
new file mode 100644
index 000000000..ac330026c
--- /dev/null
+++ b/releasenotes/notes/remove-neutron-server-opendaylight-6cacd3936c0dc91e.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``neutron-server-opendaylight`` image has been removed.