Synchronise master with upstream

README.rst

@@ -82,7 +82,6 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Horizon <https://docs.openstack.org/horizon/latest/>`__
 - `Ironic <https://docs.openstack.org/ironic/latest/>`__
 - `Keystone <https://docs.openstack.org/keystone/latest/>`__
-- `Kuryr <https://docs.openstack.org/kuryr/latest/>`__
 - `Magnum <https://docs.openstack.org/magnum/latest/>`__
 - `Manila <https://docs.openstack.org/manila/latest/>`__
 - `Masakari <https://docs.openstack.org/masakari/latest/>`__
@@ -95,7 +94,6 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
 - `Watcher <https://docs.openstack.org/watcher/latest/>`__
-- `Zun <https://docs.openstack.org/zun/latest/>`__
 
 Infrastructure components
 -------------------------

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

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

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

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

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

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

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

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

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

docker/heat/heat-api/extend_start.sh

@@ -15,5 +15,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
 
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup

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

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

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

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

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
-

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

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

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

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

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

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

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

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() }}

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