diff --git a/README.rst b/README.rst index 766d6b9281..3170ec7265 100644 --- a/README.rst +++ b/README.rst @@ -82,7 +82,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Horizon `__ - `Ironic `__ - `Keystone `__ -- `Kuryr `__ - `Magnum `__ - `Manila `__ - `Masakari `__ @@ -95,7 +94,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Tacker `__ - `Trove `__ - `Watcher `__ -- `Zun `__ Infrastructure components ------------------------- diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 7dbd5849f6..272d168a17 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -25,7 +25,6 @@ iscsid,U,U,U keepalived,U,U,U keystone,U,U,U kolla-toolbox,U,U,U -kuryr,U,U,U magnum,U,U,U manila,U,U,U mariadb,U,U,U @@ -51,4 +50,3 @@ tgtd,U,U,U trove,U,U,U valkey,U,U,U watcher,U,U,U -zun,U,U,U diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 512577aacb..00216592b9 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -26,7 +26,6 @@ iscsid,T,T,U keepalived,T,T,U keystone,T,T,T kolla-toolbox,T,T,T -kuryr,T,T,U magnum,U,U,U manila,U,U,U mariadb,T,T,T @@ -53,4 +52,3 @@ tgtd,N,T,U trove,U,U,U valkey,T,U,U watcher,U,U,U -zun,T,T,U diff --git a/docker/aodh/aodh-api/extend_start.sh b/docker/aodh/aodh-api/extend_start.sh index 07d4ce760c..575b0e5848 100644 --- a/docker/aodh/aodh-api/extend_start.sh +++ b/docker/aodh/aodh-api/extend_start.sh @@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then aodh-dbsync exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/barbican/barbican-api/extend_start.sh b/docker/barbican/barbican-api/extend_start.sh index 317f7d7d65..c541d0343e 100755 --- a/docker/barbican/barbican-api/extend_start.sh +++ b/docker/barbican/barbican-api/extend_start.sh @@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then barbican-db-manage upgrade exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index a5492b082b..94b0fe8755 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -12,5 +12,3 @@ if [[ "${!KOLLA_OSM[@]}" ]]; then cinder-manage db online_data_migrations exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh index 2b144fa3ff..26d4a8c36d 100644 --- a/docker/cloudkitty/cloudkitty-api/extend_start.sh +++ b/docker/cloudkitty/cloudkitty-api/extend_start.sh @@ -7,5 +7,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then cloudkitty-storage-init exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/cyborg/cyborg-api/extend_start.sh b/docker/cyborg/cyborg-api/extend_start.sh index 63c62ef938..b1c7af7af0 100644 --- a/docker/cyborg/cyborg-api/extend_start.sh +++ b/docker/cyborg/cyborg-api/extend_start.sh @@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then cyborg-dbsync upgrade exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/gnocchi/gnocchi-api/extend_start.sh b/docker/gnocchi/gnocchi-api/extend_start.sh index 84f33e103f..dda0461c6e 100644 --- a/docker/gnocchi/gnocchi-api/extend_start.sh +++ b/docker/gnocchi/gnocchi-api/extend_start.sh @@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then sudo -H -u gnocchi gnocchi-upgrade --log-file /var/log/kolla/gnocchi/gnocchi-upgrade.log exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 0384b7a564..b5891b0984 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -7,9 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start -RUN chmod 644 /usr/local/bin/kolla_heat_extend_start - {{ macros.kolla_patch_sources() }} {% block heat_api_cfn_footer %}{% endblock %} diff --git a/docker/heat/heat-api-cfn/extend_start.sh b/docker/heat/heat-api-cfn/extend_start.sh deleted file mode 100644 index c55f0b1995..0000000000 --- a/docker/heat/heat-api-cfn/extend_start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh index ba5f1450de..ddf4f81f45 100644 --- a/docker/heat/heat-api/extend_start.sh +++ b/docker/heat/heat-api/extend_start.sh @@ -15,5 +15,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index dae3ae2db8..7ada4c0f2c 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -184,14 +184,6 @@ function config_watcher_dashboard { "/etc/openstack-dashboard/watcher_policy.json" } -function config_zun_dashboard { - for file in ${SITE_PACKAGES}/zun_ui/enabled/_*[^__].py; do - config_dashboard "${ENABLE_ZUN:-no}" \ - "${SITE_PACKAGES}/zun_ui/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - # Regenerate the compressed javascript and css if any configuration files have # changed. Use a static modification date when generating the tarball # so that we only trigger on content changes. @@ -229,7 +221,6 @@ config_octavia_dashboard config_tacker_dashboard config_trove_dashboard config_watcher_dashboard -config_zun_dashboard if settings_changed; then ${MANAGE_PY} collectstatic --noinput --clear @@ -254,5 +245,3 @@ fi if [[ -f ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store ]] && [[ $(stat -c %U ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store) != "horizon" ]]; then chown horizon ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/ironic/ironic-api/extend_start.sh b/docker/ironic/ironic-api/extend_start.sh index b03feb65d5..ce2f7fb3e8 100644 --- a/docker/ironic/ironic-api/extend_start.sh +++ b/docker/ironic/ironic-api/extend_start.sh @@ -17,5 +17,3 @@ if [[ "${!KOLLA_OSM[@]}" ]]; then ironic-dbsync online_data_migrations exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 index 7f3a1cd9d8..3fdf78167e 100644 --- a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 +++ b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 @@ -14,7 +14,6 @@ USER root {% set ironic_prometheus_exporter_packages = [ 'httpd', 'mod_ssl', - 'python3-mod_wsgi' ] %} {{ macros.install_packages(ironic_prometheus_exporter_packages | customizable("packages")) }} @@ -24,7 +23,6 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_package_type == 'deb' %} {% set ironic_prometheus_exporter_packages = [ 'apache2', - 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(ironic_prometheus_exporter_packages | customizable("packages")) }} @@ -34,9 +32,6 @@ RUN echo > /etc/apache2/ports.conf ENV IRONIC_CONFIG /etc/ironic/ironic.conf -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - {{ macros.kolla_patch_sources() }} {% block ironic_prometheus_exporter_footer %}{% endblock %} diff --git a/docker/ironic/ironic-prometheus-exporter/extend_start.sh b/docker/ironic/ironic-prometheus-exporter/extend_start.sh deleted file mode 100644 index c55f0b1995..0000000000 --- a/docker/ironic/ironic-prometheus-exporter/extend_start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index f7bb0919ff..e1e8588bfe 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -34,7 +34,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block keystone_source_install %} ADD keystone-base-archive /keystone-base-source -ADD wsgi /var/lib/kolla/venv/bin/keystone-wsgi-public {% set keystone_base_pip_packages = [ '/keystone[ldap]', diff --git a/docker/keystone/keystone-base/wsgi b/docker/keystone/keystone-base/wsgi deleted file mode 100644 index 852ee95eb9..0000000000 --- a/docker/keystone/keystone-base/wsgi +++ /dev/null @@ -1,2 +0,0 @@ -#!/var/lib/kolla/venv/bin/python -from keystone.wsgi.api import application diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh index 25220b6839..b45c94d0d9 100644 --- a/docker/keystone/keystone/extend_start.sh +++ b/docker/keystone/keystone/extend_start.sh @@ -44,6 +44,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then sudo -H -u keystone keystone-manage ${EXTRA_KEYSTONE_MANAGE_ARGS} db_sync exit 0 fi - -. /usr/local/bin/kolla_httpd_setup - diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 deleted file mode 100644 index 025e0cdf6f..0000000000 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ /dev/null @@ -1,30 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block kuryr_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='kuryr') }} - -ADD kuryr-base-archive /kuryr-base-source - -{% set kuryr_base_pip_packages = [ - '/kuryr-base' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -# NOTE(Jeffrey4l): remove kuryr-lib constraint in upper-constraints.txt file. -# Otherwise, it will be failed. -RUN ln -s kuryr-base-source/* kuryr-base \ - && {{ macros.upper_constraints_remove("kuryr-lib") }} \ - && {{ macros.install_pip(kuryr_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/kuryr \ - && chmod 644 /usr/local/bin/kolla_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block kuryr_base_footer %}{% endblock %} diff --git a/docker/kuryr/kuryr-base/extend_start.sh b/docker/kuryr/kuryr-base/extend_start.sh deleted file mode 100644 index b109ce4f62..0000000000 --- a/docker/kuryr/kuryr-base/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -KURYR_LOG_DIR=/var/log/kolla/kuryr -KURYR_DOCKER_PLUGINS_DIR=/usr/lib/docker/plugins/kuryr - -if [[ ! -d "${KURYR_LOG_DIR}" ]]; then - mkdir -p ${KURYR_LOG_DIR} -fi -if [[ $(stat -c %a ${KURYR_LOG_DIR}) != "755" ]]; then - chmod 755 ${KURYR_LOG_DIR} -fi - -if [[ ! -d "${KURYR_DOCKER_PLUGINS_DIR}" ]]; then - mkdir -p ${KURYR_DOCKER_PLUGINS_DIR} -fi diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 deleted file mode 100644 index 8764cbb840..0000000000 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ /dev/null @@ -1,40 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}kuryr-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block kuryr_libnetwork_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - - {% set kuryr_libnetwork_packages = [ - 'openvswitch${KOLLA_RPM_OVS_VERSION}' - ] %} - -{% elif base_package_type == 'deb' %} - - {% set kuryr_libnetwork_packages = [ - 'bridge-utils', - 'openvswitch-switch' - ] %} - -{% endif %} -{{ macros.install_packages(kuryr_libnetwork_packages | customizable("packages")) }} - -ADD kuryr-libnetwork-archive /kuryr-libnetwork-source - -{% set kuryr_libnetwork_pip_packages = [ - '/kuryr-libnetwork' -] %} - -RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \ - && {{ macros.install_pip(kuryr_libnetwork_pip_packages | customizable("pip_packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block kuryr_libnetwork_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/manila/manila-api/extend_start.sh b/docker/manila/manila-api/extend_start.sh index 925d5bf604..bea77dbba4 100644 --- a/docker/manila/manila-api/extend_start.sh +++ b/docker/manila/manila-api/extend_start.sh @@ -7,5 +7,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then manila-manage db sync exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/masakari/masakari-api/extend_start.sh b/docker/masakari/masakari-api/extend_start.sh index 0e0d917a2d..549759f490 100755 --- a/docker/masakari/masakari-api/extend_start.sh +++ b/docker/masakari/masakari-api/extend_start.sh @@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then masakari-manage db sync exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/mistral/mistral-api/extend_start.sh b/docker/mistral/mistral-api/extend_start.sh index 1495541910..113adb8a21 100644 --- a/docker/mistral/mistral-api/extend_start.sh +++ b/docker/mistral/mistral-api/extend_start.sh @@ -7,5 +7,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then mistral-db-manage --config-file /etc/mistral/mistral.conf populate exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh index 40210f81c2..ead6c252b2 100644 --- a/docker/nova/nova-api/extend_start.sh +++ b/docker/nova/nova-api/extend_start.sh @@ -28,5 +28,3 @@ if [[ "${!KOLLA_UPGRADE_CHECK[@]}" ]]; then nova-status upgrade check exit $? fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/octavia/octavia-api/extend_start.sh b/docker/octavia/octavia-api/extend_start.sh index 3c45e2558e..b05d8abf1e 100644 --- a/docker/octavia/octavia-api/extend_start.sh +++ b/docker/octavia/octavia-api/extend_start.sh @@ -7,5 +7,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then octavia-db-manage upgrade_persistence exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 1b5d0ae899..f07b6a3cfa 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -30,7 +30,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'postgresql-devel', 'postgresql-server-devel', 'python3-devel', - 'python3-mod_wsgi', 'sqlite-devel', 'uwsgi-plugin-python3', 'zip' @@ -42,7 +41,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'build-essential', 'ca-certificates', 'git', - 'libapache2-mod-wsgi-py3', 'libffi-dev', 'libpcre2-dev', 'libpq-dev', diff --git a/docker/placement/placement-api/extend_start.sh b/docker/placement/placement-api/extend_start.sh index 0dd48948f6..e468cbcaf5 100644 --- a/docker/placement/placement-api/extend_start.sh +++ b/docker/placement/placement-api/extend_start.sh @@ -19,5 +19,3 @@ if [[ "${!KOLLA_OSM[@]}" ]]; then placement-manage db online_data_migrations exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 index 389f7c6181..585b964239 100644 --- a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 @@ -1,39 +1,18 @@ -FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} AS build-stage - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - - {% set prometheus_openstack_network_exporter_build_packages = [ - 'golang', - 'make', - ] %} - -{% elif base_package_type == 'deb' %} - - {% set prometheus_openstack_network_exporter_build_packages = [ - 'golang', - 'make', - ] %} - -{% endif %} - -{{ macros.install_packages(prometheus_openstack_network_exporter_build_packages | customizable("packages")) }} - -ADD prometheus-openstack-network-exporter-archive / - -RUN cd openstack-network-exporter* && make - -FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} AS final-stage +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} {% block prometheus_openstack_network_exporter_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + {% block prometheus_openstack_network_exporter_install %} -RUN mkdir /opt/openstack-network-exporter -COPY --from=build-stage /openstack-network-exporter*/dataplane-node-exporter /opt/openstack-network-exporter/ +ADD prometheus-openstack-network-exporter-archive /prometheus-openstack-network-exporter-source + +RUN mkdir /opt/openstack-network-exporter \ + && cp /prometheus-openstack-network-exporter-source /opt/openstack-network-exporter/openstack-network-exporter \ + && chmod 0755 /opt/openstack-network-exporter/openstack-network-exporter {% endblock %} {{ macros.kolla_patch_sources() }} diff --git a/docker/trove/trove-api/extend_start.sh b/docker/trove/trove-api/extend_start.sh index 02314baa72..76839e2d4c 100644 --- a/docker/trove/trove-api/extend_start.sh +++ b/docker/trove/trove-api/extend_start.sh @@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then trove-manage db_sync exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2 deleted file mode 100644 index ded752ae6f..0000000000 --- a/docker/zun/zun-api/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start -RUN chmod 644 /usr/local/bin/kolla_zun_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block zun_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/zun/zun-api/extend_start.sh b/docker/zun/zun-api/extend_start.sh deleted file mode 100644 index f21cc1bd32..0000000000 --- a/docker/zun/zun-api/extend_start.sh +++ /dev/null @@ -1,10 +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 - zun-db-manage upgrade - exit 0 -fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 deleted file mode 100644 index b6eac1907b..0000000000 --- a/docker/zun/zun-base/Dockerfile.j2 +++ /dev/null @@ -1,56 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='zun') }} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - - {% set zun_base_packages = [ - 'numactl', - ] %} - -{{ macros.install_packages(zun_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/zun - -{% elif base_package_type == 'deb' %} - - {% set zun_base_packages = [ - 'numactl', - ] %} - -{{ macros.install_packages(zun_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/zun -{% endif %} - -ADD zun-base-archive /zun-base-source - -{% set zun_base_pip_packages = [ - '/zun' -] %} - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY app.wsgi /var/www/cgi-bin/zun - -RUN ln -s zun-base-source/* zun \ - && {{ macros.install_pip(zun_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/zun /var/www/cgi-bin/zun \ - && cp -r /zun/etc/zun/* /etc/zun/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/zun/rootwrap.conf \ - && chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \ - && touch /usr/local/bin/kolla_zun_extend_start \ - && chmod 755 /var/www/cgi-bin/zun \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zun_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block zun_base_footer %}{% endblock %} diff --git a/docker/zun/zun-base/app.wsgi b/docker/zun/zun-base/app.wsgi deleted file mode 100644 index bd64371dea..0000000000 --- a/docker/zun/zun-base/app.wsgi +++ /dev/null @@ -1,2 +0,0 @@ -#!/var/lib/kolla/venv/bin/python -from zun.wsgi.api import application diff --git a/docker/zun/zun-base/extend_start.sh b/docker/zun/zun-base/extend_start.sh deleted file mode 100644 index 0a8cf13316..0000000000 --- a/docker/zun/zun-base/extend_start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/zun" ]]; then - mkdir -p /var/log/kolla/zun -fi -if [[ $(stat -c %U:%G /var/log/kolla/zun) != "zun:kolla" ]]; then - chown zun:kolla /var/log/kolla/zun -fi -if [[ $(stat -c %a /var/log/kolla/zun) != "755" ]]; then - chmod 755 /var/log/kolla/zun -fi - -. /usr/local/bin/kolla_zun_extend_start diff --git a/docker/zun/zun-base/zun_sudoers b/docker/zun/zun-base/zun_sudoers deleted file mode 100644 index fd35f4cb57..0000000000 --- a/docker/zun/zun-base/zun_sudoers +++ /dev/null @@ -1 +0,0 @@ -zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf * diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2 deleted file mode 100644 index 3534f8f3e6..0000000000 --- a/docker/zun/zun-cni-daemon/Dockerfile.j2 +++ /dev/null @@ -1,42 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_cni_daemon_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - - {% set zun_cni_daemon_packages = [ - 'openvswitch${KOLLA_RPM_OVS_VERSION}' - ] %} - -{% elif base_package_type == 'deb' %} - - {% set zun_cni_daemon_packages = [ - 'bridge-utils', - 'openvswitch-switch' - ] %} - -{% endif %} -{{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }} - -{% block zun_cni_daemon_version %} -ARG zun_cni_daemon_version=0.7.1 -ARG zun_cni_daemon_url=https://github.com/containernetworking/plugins/releases/download/v${zun_cni_daemon_version}/cni-plugins-{{debian_arch}}-v${zun_cni_daemon_version}.tgz -{% endblock %} - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers - -RUN chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \ - && curl -o /tmp/cni-plugins.tgz ${zun_cni_daemon_url} \ - && tar -C /opt -xzvf /tmp/cni-plugins.tgz ./loopback \ - && rm -f /tmp/cni-plugins.tgz - -{{ macros.kolla_patch_sources() }} - -{% block zun_cni_daemon_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/zun/zun-cni-daemon/zun_sudoers b/docker/zun/zun-cni-daemon/zun_sudoers deleted file mode 100644 index fd35f4cb57..0000000000 --- a/docker/zun/zun-cni-daemon/zun_sudoers +++ /dev/null @@ -1 +0,0 @@ -zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf * diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 deleted file mode 100644 index e6c778f0b6..0000000000 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ /dev/null @@ -1,37 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_compute_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['ceph', 'epel']) }} - -{% endif %} - -{% set zun_compute_packages = [ - 'ceph-common', - 'e2fsprogs', - 'pciutils', - 'xfsprogs', -] %} - -{{ macros.install_packages(zun_compute_packages | customizable("packages")) }} - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers -COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start - -RUN chmod 644 /usr/local/bin/kolla_zun_extend_start \ - && chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers - -{{ macros.kolla_patch_sources() }} - -{% block zun_compute_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER zun diff --git a/docker/zun/zun-compute/extend_start.sh b/docker/zun/zun-compute/extend_start.sh deleted file mode 100644 index f3b6fc48b5..0000000000 --- a/docker/zun/zun-compute/extend_start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -gid=$(stat -c "%g" /var/run/docker.sock) -sudo groupadd --force --gid $gid docker -sudo usermod -aG docker zun diff --git a/docker/zun/zun-compute/zun_sudoers b/docker/zun/zun-compute/zun_sudoers deleted file mode 100644 index b3a39af7d8..0000000000 --- a/docker/zun/zun-compute/zun_sudoers +++ /dev/null @@ -1,3 +0,0 @@ -zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf * -zun ALL=(root) NOPASSWD: /usr/sbin/groupadd --force --gid * -zun ALL=(root) NOPASSWD: /usr/sbin/usermod -aG docker zun diff --git a/docker/zun/zun-wsproxy/Dockerfile.j2 b/docker/zun/zun-wsproxy/Dockerfile.j2 deleted file mode 100644 index 09350ad404..0000000000 --- a/docker/zun/zun-wsproxy/Dockerfile.j2 +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_wsproxy_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.kolla_patch_sources() }} - -{% block zun_wsproxy_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER zun diff --git a/kolla/common/config.py b/kolla/common/config.py index d66221af1b..7657ed485e 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -88,7 +88,6 @@ 'designate', 'gnocchi', 'ironic', - 'kuryr', 'magnum', 'manila', 'masakari', @@ -97,7 +96,6 @@ 'tacker', 'trove', 'valkey', - 'zun', ], help='Aux Images'), cfg.ListOpt('default', diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 9e2e53874f..9da7ccf8b8 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -139,10 +139,6 @@ 'type': 'url', 'location': ('$tarballs_base/openstack/watcher-dashboard/' 'watcher-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-zun-ui': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zun-ui/' - 'zun-ui-${openstack_branch}.tar.gz')}, 'ironic-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/ironic/' @@ -160,14 +156,6 @@ 'type': 'url', 'location': ('$tarballs_base/openstack/requirements/' 'requirements-${openstack_branch}.tar.gz')}, - 'kuryr-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/kuryr/' - 'kuryr-${openstack_branch}.tar.gz')}, - 'kuryr-libnetwork': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/kuryr-libnetwork/' - 'kuryr-libnetwork-${openstack_branch}.tar.gz')}, 'letsencrypt-lego': { 'version': 'v4.27.0', 'type': 'url', @@ -385,17 +373,22 @@ 'openstack-exporter' '_${version}_linux_${debian_arch}.tar.gz')}, 'prometheus-openstack-network-exporter': { - 'version': '0.0.2', + 'version': '0.2.0', 'type': 'url', + 'sha256': { + 'amd64': 'c93e6c62a0b861af50292f51b1443114e2178d89450b37cb0462723eaa3b2338', # noqa: E501 + 'arm64': '478de6e005188d0e2545e34ca2c5b93a33a32dc7d1f1b03dc3210c4ef7e44305'}, # noqa: E501 'location': ('https://github.com/' 'openstack-k8s-operators/openstack-network-exporter/' - 'archive/v${version}.tar.gz')}, + 'releases/download/v${version}/' + 'openstack-network-exporter' + '-linux-${debian_arch}')}, 'prometheus-server': { - 'version': '3.5.1', + 'version': '3.5.2', 'type': 'url', 'sha256': { - 'amd64': 'cd6aea0ab214b05838470668dfcee7d01a7d91913509a227b00401ca872423f0', # noqa: E501 - 'arm64': 'cdb1de33d6d3ed73b4633cebedb70258c29e41bd132d287d387f322a046143d2'}, # noqa: E501 + 'amd64': '552c6d701e27d3c77983bb8a76e61953cb60021f6e10f17a929546a6dedc436a', # noqa: E501 + 'arm64': '06a77b3f580b0db0f41e1c52274503b609db58660e44577facb0ee53e4ff8b27'}, # noqa: E501 'location': ('https://github.com/' 'prometheus/prometheus/' 'releases/download/v${version}/' @@ -435,9 +428,5 @@ 'watcher-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher/' - 'watcher-${openstack_branch}.tar.gz')}, - 'zun-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zun/' - 'zun-${openstack_branch}.tar.gz')} + 'watcher-${openstack_branch}.tar.gz')} } diff --git a/kolla/common/users.py b/kolla/common/users.py index 623456071f..cd0a666607 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -229,7 +229,7 @@ 'uid': 42462, 'gid': 42462, }, - 'zun-user': { + 'zun-user': { # unused user (zun dropped) 'uid': 42463, 'gid': 42463, }, @@ -253,7 +253,7 @@ 'uid': 42468, 'gid': 42468, }, - 'kuryr-user': { + 'kuryr-user': { # unused user (kuryr dropped) 'uid': 42469, 'gid': 42469, }, diff --git a/lint-requirements.txt b/lint-requirements.txt new file mode 100644 index 0000000000..3a87b7a7b9 --- /dev/null +++ b/lint-requirements.txt @@ -0,0 +1 @@ +ansible-lint===26.4.0 # MIT diff --git a/releasenotes/notes/drop-kuryr-and-zun-e48eb3d9d6a61758.yaml b/releasenotes/notes/drop-kuryr-and-zun-e48eb3d9d6a61758.yaml new file mode 100644 index 0000000000..e3de80a66a --- /dev/null +++ b/releasenotes/notes/drop-kuryr-and-zun-e48eb3d9d6a61758.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Support for building ``zun`` images has been dropped, due to the project + being released broken. ``kuryr`` container images support has also been + dropped because only ``zun`` was using them. diff --git a/releasenotes/notes/update-prometheus-server-3.5.1-e23a9826b25573a8.yaml b/releasenotes/notes/update-prometheus-server-3.5.1-e23a9826b25573a8.yaml deleted file mode 100644 index 7404ee0b37..0000000000 --- a/releasenotes/notes/update-prometheus-server-3.5.1-e23a9826b25573a8.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -features: - - | - Updates Prometheus to version 3.5.1. diff --git a/releasenotes/notes/update-prometheus-server-3.5.2-e23a9826b25573a8.yaml b/releasenotes/notes/update-prometheus-server-3.5.2-e23a9826b25573a8.yaml new file mode 100644 index 0000000000..5d15be9033 --- /dev/null +++ b/releasenotes/notes/update-prometheus-server-3.5.2-e23a9826b25573a8.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Updates Prometheus to version 3.5.2. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 81313edaf5..0306bb0cf7 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -27,8 +27,6 @@ kolla_build_sources: openstack/heat: heat-base openstack/ironic: ironic-base openstack/keystone: keystone-base - openstack/kuryr: kuryr-base - openstack/kuryr-libnetwork: kuryr-libnetwork openstack/magnum: magnum-base openstack/manila: manila-base openstack/mistral: mistral-base @@ -59,7 +57,6 @@ kolla_build_sources: - mistral-base-plugin-tacker openstack/trove: trove-base openstack/watcher: watcher-base - openstack/zun: zun-base # Horizon and its plugins openstack/horizon: horizon @@ -77,4 +74,3 @@ kolla_build_sources: openstack/tacker-horizon: horizon-plugin-tacker-dashboard openstack/trove-dashboard: horizon-plugin-trove-dashboard openstack/watcher-dashboard: horizon-plugin-watcher-dashboard - openstack/zun-ui: horizon-plugin-zun-ui diff --git a/test-requirements.txt b/test-requirements.txt index 19e65b2d60..2acfc73a44 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,4 @@ ansible-core>=2.18,<2.20; python_version >= '3.11' # GPLv3 -ansible-lint===26.4.0 # MIT bandit!=1.6.0,>=1.1.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 diff --git a/tools/version-check.py b/tools/version-check.py index 2455033022..2220b4a524 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -52,7 +52,6 @@ # NOTE(hrw): those projects have different names for release tarballs (first # column) and other for branch tarballs RENAME_PROJECTS = { - 'kuryr-lib': 'kuryr', 'openstack-cyborg': 'cyborg', 'openstack-heat': 'heat', 'openstack-placement': 'placement', diff --git a/tox.ini b/tox.ini index 30e5fe85b3..cd0c059520 100644 --- a/tox.ini +++ b/tox.ini @@ -42,7 +42,9 @@ commands = [testenv:pep8] deps = - {[testenv]deps} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/lint-requirements.txt codespell allowlist_externals = bash commands = diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index e071fd5898..5d491bc0bf 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -14,6 +14,7 @@ - ^.*\.rst$ - ^doc/.* - ^etc/.* + - ^lint-requirements.txt$ - ^releasenotes/.*$ - ^specs/.*$ - ^test-requirements.txt$ diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml index 7d92bc60a3..1bd5e7e1e1 100644 --- a/zuul.d/scenarios/ovn.yaml +++ b/zuul.d/scenarios/ovn.yaml @@ -6,8 +6,8 @@ check: jobs: - kolla-ansible-debian-trixie-ovn: - files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ + files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/ - kolla-ansible-rocky-10-ovn: - files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ + files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/ - kolla-ansible-ubuntu-noble-ovn: - files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ + files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/