Drop Vitrage

It has been deprecated in Antelope cycle.

Change-Id: Ie9cc529d186b74ea3d07b0082f9c965d4aa054e9

README.rst

@@ -96,7 +96,6 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
 - `Venus <https://docs.openstack.org/venus/latest/>`__
-- `Vitrage <https://docs.openstack.org/vitrage/latest/>`__ (deprecated)
 - `Watcher <https://docs.openstack.org/watcher/latest/>`__
 - `Zun <https://docs.openstack.org/zun/latest/>`__
 

doc/source/matrix_aarch64.csv

@@ -53,6 +53,5 @@ tacker,U,U,U
 telegraf,N,N,N
 tgtd,U,U,U
 trove,U,U,U
-vitrage,U,U,U
 watcher,U,U,U
 zun,U,U,U

doc/source/matrix_x86.csv

@@ -54,6 +54,5 @@ tacker,T,U,U
 telegraf,U,U,U
 tgtd,N,T,U
 trove,U,U,U
-vitrage,U,U,U
 watcher,U,U,U
 zun,T,T,U

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
 

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',

docker/vitrage/vitrage-api/Dockerfile.j2

@@ -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 %}

docker/vitrage/vitrage-api/extend_start.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    vitrage-dbsync
-    exit 0
-fi
-
-. /usr/local/bin/kolla_httpd_setup

docker/vitrage/vitrage-base/Dockerfile.j2

@@ -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 %}

docker/vitrage/vitrage-base/extend_start.sh

@@ -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

docker/vitrage/vitrage-graph/Dockerfile.j2

@@ -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

docker/vitrage/vitrage-ml/Dockerfile.j2

@@ -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

docker/vitrage/vitrage-notifier/Dockerfile.j2

@@ -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

docker/vitrage/vitrage-persistor/Dockerfile.j2

@@ -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

kolla/common/config.py

@@ -104,7 +104,6 @@ _PROFILE_OPTS = [
                     'tacker',
                     'telegraf',
                     'trove',
-                    'vitrage',
                     'zookeeper',
                     'zun',
                 ],

kolla/common/sources.py

@@ -143,10 +143,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/venus-dashboard/'
                      'venus-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-vitrage-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/vitrage-dashboard/'
-                     'vitrage-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-watcher-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/watcher-dashboard/'
@@ -443,10 +439,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/venus/'
                      'venus-${openstack_branch}.tar.gz')},
-    'vitrage-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/vitrage/'
-                     'vitrage-${openstack_branch}.tar.gz')},
     'watcher-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/watcher/'

kolla/common/users.py

@@ -213,7 +213,7 @@ USERS = {
         'uid': 42457,
         'gid': 42457,
     },
-    'vitrage-user': {
+    'vitrage-user': {  # unused user (vitrage dropped)
         'uid': 42459,
         'gid': 42459,
     },

releasenotes/notes/drop-vitrage-d871449de1e06458.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    ``Vitrage`` container images have been dropped.

roles/kolla-build-config/defaults/main.yml

@@ -61,7 +61,6 @@ kolla_build_sources:
     - mistral-base-plugin-tacker
   openstack/trove: trove-base
   openstack/venus: venus-base
-  openstack/vitrage: vitrage-base
   openstack/watcher: watcher-base
   openstack/zun: zun-base
 
@@ -81,6 +80,5 @@ kolla_build_sources:
   openstack/tacker-horizon: horizon-plugin-tacker-dashboard
   openstack/trove-dashboard: horizon-plugin-trove-dashboard
   openstack/venus-dashboard: horizon-plugin-venus-dashboard
-  openstack/vitrage-dashboard: horizon-plugin-vitrage-dashboard
   openstack/watcher-dashboard: horizon-plugin-watcher-dashboard
   openstack/zun-ui: horizon-plugin-zun-ui