Revert "venus: add log management system"

Reason for revert: venus was not released for yoga and thus isn't
available for this branch

Fixed merge conflicts introduced by [0] and [1].

This reverts commit 3d51f06464.

[0] I8bdce3b76bc02fdcc029f90cf1984e6b3d4eb961
[1] I4fff070ffef0a10887e1f26809bb43d20f48ea35

Change-Id: Ic298608c5711916942c1001a4c1530c4d15912ef

docker/venus/venus-api/Dockerfile.j2

@@ -1,11 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}venus-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block venus_api_header %}{% endblock %}
-
-{% block venus_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER venus

docker/venus/venus-base/Dockerfile.j2

@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block venus_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='venus') }}
-
-ADD venus-base-archive /venus-base-source
-
-{% set venus_base_pip_packages = [
-    '/venus'
-] %}
-
-RUN ln -s venus-base-source/* venus \
-    && {{ macros.install_pip(venus_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/venus \
-    && cp -r /venus/etc/venus/* /etc/venus/ \
-    && chown -R venus: /etc/venus
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_venus_extend_start \
-    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_venus_extend_start
-
-{% block venus_base_footer %}{% endblock %}

docker/venus/venus-base/extend_start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/venus" ]]; then
-    mkdir -p /var/log/kolla/venus
-fi
-if [[ $(stat -c %a /var/log/kolla/venus) != "755" ]]; then
-    chmod 755 /var/log/kolla/venus
-fi
-
-. /usr/local/bin/kolla_venus_extend_start

docker/venus/venus-manager/Dockerfile.j2

@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}venus-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block venus_manager_header %}{% endblock %}
-
-RUN chmod 755 /usr/local/bin/kolla_venus_extend_start
-
-{% block venus_manager_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER venus

kolla/common/config.py

@@ -621,12 +621,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/trove/'
                      'trove-${openstack_branch}.tar.gz')},
-    # FIXME(mgoddard): Revert to ${openstack_branch} when a stable-yoga tarball
-    # exists.
-    'venus-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/venus/'
-                     'venus-master.tar.gz')},
     'vitrage-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/vitrage/'
@@ -957,10 +951,6 @@ USERS = {
     'letsencrypt-user': {
         'uid': 42488,
         'gid': 42488,
-    },
-    'venus-user': {
-        'uid': 42489,
-        'gid': 42489,
     }
 }
 

kolla/image/build.py

@@ -95,7 +95,6 @@ UNBUILDABLE_IMAGES = {
         "monasca-base",
         "monasca-thresh",
         "solum-base",
-        "venus-base",
         "zun-base",
     },
 

releasenotes/notes/add-venus-e2a9824f5ef5cf30.yaml

@@ -1,7 +0,0 @@
----
-features:
-  - |
-    Adds Venus images. Venus is an OpenStack project to provide "one-stop
-    solution to log collection, cleaning, indexing, analysis, alarm,
-    visualization service". This project aims to provide
-    a platform to quickly solve service exception problems.

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

@@ -65,7 +65,6 @@ kolla_build_sources:
     - tacker-base
     - mistral-base-plugin-tacker
   openstack/trove: trove-base
-  openstack/venus: venus-base
   openstack/vitrage: vitrage-base
   openstack/watcher: watcher-base
   openstack/zun: zun-base