Drop Venus images

It has been marked as inactive and venus dashboard plugin is breaking
Horizon Kolla builds.

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/964860

Change-Id: I3a04487a75c04ba989fa70f2025db33308671dfb
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
This commit is contained in:
Michal Nasiadka
2025-10-27 09:14:16 +01:00
parent 9bc8d4d081
commit 539342b730
11 changed files with 6 additions and 101 deletions

View File

@@ -94,7 +94,6 @@ Kolla provides images to deploy the following OpenStack projects:
- Skyline (`APIServer <https://docs.openstack.org/skyline-apiserver/latest/>`__ and `Console <https://docs.openstack.org/skyline-console/latest/>`__)
- `Tacker <https://docs.openstack.org/tacker/latest/>`__
- `Trove <https://docs.openstack.org/trove/latest/>`__
- `Venus <https://docs.openstack.org/venus/latest/>`__
- `Watcher <https://docs.openstack.org/watcher/latest/>`__
- `Zun <https://docs.openstack.org/zun/latest/>`__

View File

@@ -172,14 +172,6 @@ function config_trove_dashboard {
done
}
function config_venus_dashboard {
for file in ${SITE_PACKAGES}/venus_dashboard/enabled/_*[^__].py; do
config_dashboard "${ENABLE_VENUS:-no}" \
"${SITE_PACKAGES}/venus_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}" \
@@ -236,7 +228,6 @@ config_neutron_vpnaas_dashboard
config_octavia_dashboard
config_tacker_dashboard
config_trove_dashboard
config_venus_dashboard
config_watcher_dashboard
config_zun_dashboard

View File

@@ -1,18 +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 %}
{% import "macros.j2" as macros with context %}
COPY extend_start.sh /usr/local/bin/kolla_venus_extend_start
RUN chmod 644 /usr/local/bin/kolla_venus_extend_start
{{ macros.kolla_patch_sources() }}
{% block venus_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER venus

View File

@@ -1,8 +0,0 @@
#!/bin/bash
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
venus_manager db sync
exit 0
fi

View File

@@ -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'
] %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
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/ \
&& touch /usr/local/bin/kolla_venus_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_venus_extend_start
{{ macros.kolla_patch_sources() }}
{% block venus_base_footer %}{% endblock %}

View File

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

View File

@@ -1,15 +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 %}
{% import "macros.j2" as macros with context %}
{{ macros.kolla_patch_sources() }}
{% block venus_manager_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER venus

View File

@@ -135,10 +135,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/trove-dashboard/'
'trove-dashboard-${openstack_branch}.tar.gz')},
'horizon-plugin-venus-dashboard': {
'type': 'url',
'location': ('$tarballs_base/openstack/venus-dashboard/'
'venus-dashboard-${openstack_branch}.tar.gz')},
'horizon-plugin-watcher-dashboard': {
'type': 'url',
'location': ('$tarballs_base/openstack/watcher-dashboard/'
@@ -415,10 +411,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/trove/'
'trove-${openstack_branch}.tar.gz')},
'venus-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/venus/'
'venus-${openstack_branch}.tar.gz')},
'watcher-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/watcher/'

View File

@@ -326,7 +326,7 @@ USERS = {
'uid': 42488,
'gid': 42488,
},
'venus-user': {
'venus-user': { # unused user (venus dropped)
'uid': 42489,
'gid': 42489,
},

View File

@@ -0,0 +1,5 @@
---
upgrade:
- |
Support for building ``Venus`` container images has been dropped,
following it's inactivity and producing breaking Horizon plugin builds.

View File

@@ -58,7 +58,6 @@ kolla_build_sources:
- tacker-base
- mistral-base-plugin-tacker
openstack/trove: trove-base
openstack/venus: venus-base
openstack/watcher: watcher-base
openstack/zun: zun-base
@@ -77,6 +76,5 @@ kolla_build_sources:
openstack/octavia-dashboard: horizon-plugin-octavia-dashboard
openstack/tacker-horizon: horizon-plugin-tacker-dashboard
openstack/trove-dashboard: horizon-plugin-trove-dashboard
openstack/venus-dashboard: horizon-plugin-venus-dashboard
openstack/watcher-dashboard: horizon-plugin-watcher-dashboard
openstack/zun-ui: horizon-plugin-zun-ui