diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2020-07-06 11:48:24 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-07-07 12:50:38 +0200 |
| commit | 6c77d52cda63cc51f6e15943b1733a5100b08392 (patch) | |
| tree | ff39c8b174c01627338e545143df67b1cadd7f09 /docker/opendaylight | |
| parent | 4f4b0126a9316b2746306eec86c1224f220aef1c (diff) | |
| download | kolla-6c77d52cda63cc51f6e15943b1733a5100b08392.tar.gz kolla-6c77d52cda63cc51f6e15943b1733a5100b08392.zip | |
Remove opendaylight image
It has been deprecated in Ussuri cycle.
Change-Id: I6d3174e8b52cb4d1f2eca4d85d506665dafe2406
Diffstat (limited to 'docker/opendaylight')
| -rw-r--r-- | docker/opendaylight/Dockerfile.j2 | 43 | ||||
| -rw-r--r-- | docker/opendaylight/extend_start.sh | 10 |
2 files changed, 0 insertions, 53 deletions
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 |