aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2025-10-27 09:14:16 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2025-10-27 09:38:44 +0000
commit539342b730a21c1fb81f2e8a7c3c170c73afbc5e (patch)
tree9894e3122686500111293995b244b543913c0eba
parent9bc8d4d0816ac89614a703170601046e57f54c57 (diff)
downloadkolla-539342b730a21c1fb81f2e8a7c3c170c73afbc5e.tar.gz
kolla-539342b730a21c1fb81f2e8a7c3c170c73afbc5e.zip
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>
-rw-r--r--README.rst1
-rw-r--r--docker/horizon/extend_start.sh9
-rw-r--r--docker/venus/venus-api/Dockerfile.j218
-rw-r--r--docker/venus/venus-api/extend_start.sh8
-rw-r--r--docker/venus/venus-base/Dockerfile.j229
-rw-r--r--docker/venus/venus-base/extend_start.sh10
-rw-r--r--docker/venus/venus-manager/Dockerfile.j215
-rw-r--r--kolla/common/sources.py8
-rw-r--r--kolla/common/users.py2
-rw-r--r--releasenotes/notes/drop-venus-435234b3bff7f209.yaml5
-rw-r--r--roles/kolla-build-config/defaults/main.yml2
11 files changed, 6 insertions, 101 deletions
diff --git a/README.rst b/README.rst
index 71a4073b2..4af919296 100644
--- a/README.rst
+++ b/README.rst
@@ -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/>`__
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 41695a9d5..dae3ae2db 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -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
diff --git a/docker/venus/venus-api/Dockerfile.j2 b/docker/venus/venus-api/Dockerfile.j2
deleted file mode 100644
index 35ac69dca..000000000
--- a/docker/venus/venus-api/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/docker/venus/venus-api/extend_start.sh b/docker/venus/venus-api/extend_start.sh
deleted file mode 100644
index bbe03bbbc..000000000
--- a/docker/venus/venus-api/extend_start.sh
+++ /dev/null
@@ -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
diff --git a/docker/venus/venus-base/Dockerfile.j2 b/docker/venus/venus-base/Dockerfile.j2
deleted file mode 100644
index 729ae6bd4..000000000
--- a/docker/venus/venus-base/Dockerfile.j2
+++ /dev/null
@@ -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 %}
diff --git a/docker/venus/venus-base/extend_start.sh b/docker/venus/venus-base/extend_start.sh
deleted file mode 100644
index fa7bbe54b..000000000
--- a/docker/venus/venus-base/extend_start.sh
+++ /dev/null
@@ -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
diff --git a/docker/venus/venus-manager/Dockerfile.j2 b/docker/venus/venus-manager/Dockerfile.j2
deleted file mode 100644
index 35575adb6..000000000
--- a/docker/venus/venus-manager/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index 70ff33ea7..4073ae12a 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -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/'
diff --git a/kolla/common/users.py b/kolla/common/users.py
index 95aefa4b6..b1edb2949 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -326,7 +326,7 @@ USERS = {
'uid': 42488,
'gid': 42488,
},
- 'venus-user': {
+ 'venus-user': { # unused user (venus dropped)
'uid': 42489,
'gid': 42489,
},
diff --git a/releasenotes/notes/drop-venus-435234b3bff7f209.yaml b/releasenotes/notes/drop-venus-435234b3bff7f209.yaml
new file mode 100644
index 000000000..879e494a0
--- /dev/null
+++ b/releasenotes/notes/drop-venus-435234b3bff7f209.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Support for building ``Venus`` container images has been dropped,
+ following it's inactivity and producing breaking Horizon plugin builds.
diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml
index e8c6f7841..81313edaf 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/roles/kolla-build-config/defaults/main.yml
@@ -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