diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-24 17:55:26 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-24 17:55:48 +0200 |
| commit | e47e24c9463b6f3dce177f7436376c2b3413c4de (patch) | |
| tree | 699db23ae99b93f9be6a4ed5569d68d587473919 /docker | |
| parent | 7837a069ea05b86e9a83203c6d8a7e6e386b4fb6 (diff) | |
| download | kolla-e47e24c9463b6f3dce177f7436376c2b3413c4de.tar.gz kolla-e47e24c9463b6f3dce177f7436376c2b3413c4de.zip | |
Drop Vitrage
It has been deprecated in Antelope cycle.
Change-Id: Ie9cc529d186b74ea3d07b0082f9c965d4aa054e9
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-api/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-api/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-base/Dockerfile.j2 | 41 | ||||
| -rwxr-xr-x | docker/vitrage/vitrage-base/extend_start.sh | 14 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-graph/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-ml/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-notifier/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-persistor/Dockerfile.j2 | 13 |
10 files changed, 0 insertions, 139 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index e0868de72..5a71d6be1 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -180,14 +180,6 @@ function config_venus_dashboard { done } -function config_vitrage_dashboard { - for file in ${SITE_PACKAGES}/vitrage_dashboard/enabled/_*[^__].py; do - config_dashboard "${ENABLE_VITRAGE:-no}" \ - "${SITE_PACKAGES}/vitrage_dashboard/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_watcher_dashboard { for file in ${SITE_PACKAGES}/watcher_dashboard/local/enabled/_*[^__].py; do config_dashboard "${ENABLE_WATCHER:-no}" \ @@ -245,7 +237,6 @@ config_octavia_dashboard config_tacker_dashboard config_trove_dashboard config_venus_dashboard -config_vitrage_dashboard config_watcher_dashboard config_zun_dashboard diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 7ca946102..df03aaced 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -162,7 +162,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-qpid-proton', 'python-swiftclient', 'python-troveclient', - 'python-vitrageclient', 'pytz', 'repoze.lru', 'requests', diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 deleted file mode 100644 index 2f0521d95..000000000 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ /dev/null @@ -1,14 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block vitrage_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_vitrage_extend_start -RUN chmod 644 /usr/local/bin/kolla_vitrage_extend_start - -{% block vitrage_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/vitrage/vitrage-api/extend_start.sh b/docker/vitrage/vitrage-api/extend_start.sh deleted file mode 100644 index 7f1af9b46..000000000 --- a/docker/vitrage/vitrage-api/extend_start.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - vitrage-dbsync - exit 0 -fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 deleted file mode 100644 index ae46ca8cc..000000000 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ /dev/null @@ -1,41 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block vitrage_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='vitrage') }} - -{% if base_package_type == 'rpm' %} - - {% set vitrage_base_packages = [ - ] %} - -{% elif base_package_type == 'deb' %} - - {% set vitrage_base_packages = [ - ] %} - -{% endif %} -{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} - -{% set vitrage_base_pip_packages = [ - '/vitrage' -] %} - -ADD vitrage-base-archive /vitrage-base-source - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s vitrage-base-source/* vitrage \ - && {{ macros.install_pip(vitrage_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/vitrage /var/www/cgi-bin/vitrage \ - && cp -r /vitrage/etc/vitrage/* /etc/vitrage/ \ - && cp /vitrage/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage \ - && touch /usr/local/bin/kolla_vitrage_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_vitrage_extend_start - -{% block vitrage_base_footer %}{% endblock %} diff --git a/docker/vitrage/vitrage-base/extend_start.sh b/docker/vitrage/vitrage-base/extend_start.sh deleted file mode 100755 index 3092c8146..000000000 --- a/docker/vitrage/vitrage-base/extend_start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -VITRAGE_LOG_DIR="/var/log/kolla/vitrage" -if [[ ! -d "${VITRAGE_LOG_DIR}" ]]; then - mkdir -p ${VITRAGE_LOG_DIR} -fi -if [[ $(stat -c %U:%G ${VITRAGE_LOG_DIR}) != "vitrage:kolla" ]]; then - chown vitrage:kolla ${VITRAGE_LOG_DIR} -fi -if [[ $(stat -c %a ${VITRAGE_LOG_DIR}) != "755" ]]; then - chmod 755 ${VITRAGE_LOG_DIR} -fi - -. /usr/local/bin/kolla_vitrage_extend_start diff --git a/docker/vitrage/vitrage-graph/Dockerfile.j2 b/docker/vitrage/vitrage-graph/Dockerfile.j2 deleted file mode 100644 index aea406f94..000000000 --- a/docker/vitrage/vitrage-graph/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block vitrage_graph_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block vitrage_graph_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER vitrage diff --git a/docker/vitrage/vitrage-ml/Dockerfile.j2 b/docker/vitrage/vitrage-ml/Dockerfile.j2 deleted file mode 100644 index aea3ec678..000000000 --- a/docker/vitrage/vitrage-ml/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block vitrage_ml_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block vitrage_ml_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER vitrage diff --git a/docker/vitrage/vitrage-notifier/Dockerfile.j2 b/docker/vitrage/vitrage-notifier/Dockerfile.j2 deleted file mode 100644 index 2af6f39d8..000000000 --- a/docker/vitrage/vitrage-notifier/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block vitrage_notifier_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block vitrage_notifier_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER vitrage diff --git a/docker/vitrage/vitrage-persistor/Dockerfile.j2 b/docker/vitrage/vitrage-persistor/Dockerfile.j2 deleted file mode 100644 index 16bdbe0b8..000000000 --- a/docker/vitrage/vitrage-persistor/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block vitrage_persistor_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block vitrage_persistor_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER vitrage |
