Merge "Remove opendaylight image"

5 files changed, 0 insertions, 63 deletions

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