Remove opendaylight image

It has been deprecated in Ussuri cycle.

Change-Id: I6d3174e8b52cb4d1f2eca4d85d506665dafe2406

12 files changed, 5 insertions, 112 deletions

diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2
deleted file mode 100644
index 76d93b24f..000000000
--- a/contrib/template-override/opendaylight-template-overrides.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends parent_template %}
-
-{% block opendaylight_install %}
-  {% if base_package_type == 'rpm' %}
-    {% set opendaylight_packages = ['java-1.8.0-openjdk'] %}
-  {% elif base_package_type == 'deb' %}
-    {% set opendaylight_packages = ['openjdk-8-jre'] %}
-  {% endif %}
-
-{{ macros.install_packages(opendaylight_packages | customizable("packages")) }}
-
-ADD opendaylight-archive /opendaylight
-RUN ln -s /opendaylight/* /opt/opendaylight
-{% endblock %}
diff --git a/doc/source/admin/template-override/opendaylight-source.rst b/doc/source/admin/template-override/opendaylight-source.rst
deleted file mode 100644
index f86cfa68e..000000000
--- a/doc/source/admin/template-override/opendaylight-source.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-==================
-OpenDaylight Build
-==================
-
-The `opendaylight-template-overrides.j2` template override shows how to build
-an OpenDaylight container image with a different version than the one packaged
-with the distro.
-
-Building OpenDaylight Container Images
-======================================
-
-kolla-build.conf
-----------------
-
-Point to the desired version of OpenDaylight in `kolla-build.conf`:
-
-.. code-block:: ini
-
-   [opendaylight]
-   type = url
-   location = https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz
-
-Build the container by executing the following command:
-
-.. code-block:: console
-
-   kolla-build --type source --template-override contrib/template-override/opendaylight-template-overrides.j2 opendaylight
-
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index e5beb94f8..4afb8a26b 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -56,7 +56,6 @@ nova,C,C,C,C,N,C
 nova-spicehtml5proxy,N,N,C,C,N,C
 novajoin,C,C,N,C,N,C
 octavia,C,C,N,C,N,C
-opendaylight (deprecated),N,N,N,N,N,N
 openvswitch,C,C,C,C,N,C
 ovn,C,C,C,C,N,C
 ovsdpdk,N,N,C,C,N,N
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index c23b4edff..83a2e1940 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -57,7 +57,6 @@ nova,T,T,T,T,C,T
 nova-spicehtml5proxy,N,N,T,T,C,T
 novajoin,C,C,N,C,N,C
 octavia,C,C,N,C,C,C
-opendaylight (deprecated),C,C,C,C,N,N
 openvswitch,T,T,T,T,C,T
 ovn,C,C,C,C,C,C
 ovsdpdk,N,N,C,C,N,N
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index e47979472..cdf79d66a 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -80,7 +80,6 @@ COPY dnf.conf /etc/dnf/dnf.conf
     ] %}
     # FIXME(mgoddard): Not available for CentOS 8 yet.
     #   'crmsh.repo',
-    #   'opendaylight.repo',
 
     {% set base_yum_repo_keys = [
         'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
@@ -340,7 +339,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 {% if base_distro == 'ubuntu' %}
     {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #}
     {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #}
-    {# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key <https://launchpad.net/~odl-team> #}
     {# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #}
     {# 4D8EB5FDA37AB55F41A135203BF88A0C6A770882 -- Apache Qpid PPA Signing Key <dev@qpid.apache.org> #}
     {# 901F9177AB97ACBE                         -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #}
diff --git a/docker/base/opendaylight.repo b/docker/base/opendaylight.repo
deleted file mode 100644
index c8659b96f..000000000
--- a/docker/base/opendaylight.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[opendaylight]
-name=OpenDaylight Carbon
-baseurl=https://nexus.opendaylight.org/content/repositories/opendaylight-carbon-epel-7-x86_64-devel/
-enabled=0
-gpgcheck=0
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index 758d2ceab..d664f491b 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -33,9 +33,6 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
 # Qdrouterd repo
 #deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main
 
-# Opendaylight repo
-#deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main
-
 # rabbitmq repo
 #deb https://dl.bintray.com/rabbitmq/debian/ bionic main
 
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2
deleted file mode 100644
index 6616f9318..000000000
--- a/docker/opendaylight/Dockerfile.j2
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block opendaylight_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='odl') }}
-
-{{ macros.enable_extra_repos(['opendaylight']) }}
-
-{% block opendaylight_install %}
-
-{% if base_package_type == 'rpm' %}
-    {% set opendaylight_packages = [
-        'java-1.8.0-openjdk-headless',
-        'opendaylight',
-    ] %}
-{% elif base_package_type == 'deb' %}
-
-    {% if base_distro == 'debian' %}
-        {% set java_version = '11' %}
-    {% elif base_distro == 'ubuntu' %}
-        {% set java_version = '8' %}
-    {% endif %}
-
-    {% set opendaylight_packages = [
-        'opendaylight',
-        'openjdk-' + java_version + '-jre-headless',
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(opendaylight_packages | customizable("packages")) }}
-
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{% block opendaylight_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/opendaylight/extend_start.sh b/docker/opendaylight/extend_start.sh
deleted file mode 100644
index 8fdba0726..000000000
--- a/docker/opendaylight/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-OPENDAYLIGHT_LOG_DIR=/var/log/kolla/opendaylight
-
-if [[ ! -d "${OPENDAYLIGHT_LOG_DIR}" ]]; then
-    mkdir -p "${OPENDAYLIGHT_LOG_DIR}"
-fi
-if [[ $(stat -c %a "${OPENDAYLIGHT_LOG_DIR}") != "755" ]]; then
-    chmod 755 "${OPENDAYLIGHT_LOG_DIR}"
-fi
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 4b32a0e4a..91c7c5b30 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -81,7 +81,6 @@ STATUS_ERRORS = (STATUS_CONNECTION_ERROR, STATUS_PUSH_ERROR,
 UNBUILDABLE_IMAGES = {
     'aarch64': {
         "monasca-grafana",   # no phantomJS on aarch64
-        "opendaylight",      # no binary package
         "prometheus-mtail",  # no aarch64 binary
         "skydive-base",      # no aarch64 binary
     },
@@ -90,7 +89,6 @@ UNBUILDABLE_IMAGES = {
         "elasticsearch",     # no binary package
         "grafana",           # no binary package
         "monasca-grafana",   # no phantomJS
-        "opendaylight",      # no binary package
         "prometheus-base",   # no ppc64le binaries
         "skydive-base",      # no ppc64le binaries
         "telegraf",          # no binary package
@@ -129,7 +127,6 @@ UNBUILDABLE_IMAGES = {
     'centos': {
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
-        "opendaylight",          # Missing opendaylight repo
         "ovsdpdk",               # Not supported on CentOS
         "tgtd",                  # Not supported on CentOS 8
     },
@@ -138,7 +135,6 @@ UNBUILDABLE_IMAGES = {
         "bifrost-base",  # tries to install 'mysql-server' which is not in
                          # Debian 'buster'
         "monasca-grafana",  # FIXME(hrw): some ssl issues to fix
-        "opendaylight",  # no binary package
         "ovsdpdk",
         "qdrouterd",
     },
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 9b9a4abdb..7ef94c28d 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -68,7 +68,6 @@ ubuntu:
   influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable"
   kibana: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
-  opendaylight: "deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main"
   qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main"
   rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
   td-agent: "deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib"
diff --git a/releasenotes/notes/remove-opendaylight-ac316f8ada083cc9.yaml b/releasenotes/notes/remove-opendaylight-ac316f8ada083cc9.yaml
new file mode 100644
index 000000000..8880e7113
--- /dev/null
+++ b/releasenotes/notes/remove-opendaylight-ac316f8ada083cc9.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``opendaylight`` image, which was deprecated in the Ussuri cycle, has
+    been removed.