Synchronise master with upstream

README.rst

@@ -8,17 +8,18 @@ Kolla Overview
 .. Change things from this point on
 
 
-The Kolla project is a member of the OpenStack `Big Tent
-Governance <https://governance.openstack.org/tc/reference/projects/index.html>`__.
+The Kolla project is a member of the OpenStack `Governance
+<https://governance.openstack.org/tc/reference/projects/index.html>`__.
 
 Kolla's mission statement is:
 
 ::
 
-    To provide production-ready containers and deployment tools for operating
-    OpenStack clouds.
+    To provide tools to create production-ready containers and
+    to provide deployment tools for operating OpenStack clouds.
 
-Kolla provides `Docker <https://docker.com/>`__ containers,
+Kolla provides tools to create containers that can be run under either
+`Docker <https://docker.com/>`__ or `Podman <https://podman.io/>`, as well as
 `Ansible <https://ansible.com/>`__ playbooks to deploy OpenStack on baremetal
 or virtual machine to meet Kolla's mission.
 
@@ -39,29 +40,28 @@ Quickstart <https://docs.openstack.org/kolla-ansible/latest/user/quickstart.html
 The Kolla Repository
 ====================
 
-The Kolla repository is one of three deliverables of the OpenStack Kolla
-project. The three deliverables that make up the Kolla project are:
-
-================   =========================================================
-Deliverable        Repository
-================   =========================================================
-kolla              https://opendev.org/openstack/kolla
-kolla-ansible      https://opendev.org/openstack/kolla-ansible
-kayobe             https://opendev.org/openstack/kayobe
-================   =========================================================
-
-The `Docker images <https://docs.docker.com/storage/storagedriver/>`__
-are built by the Kolla project maintainers. A detailed process for
-contributing to the images can be found in the `image building
-guide <https://docs.openstack.org/kolla/latest/admin/image-building.html>`__.
-
-The Kolla developers build images in the `kolla` namespace for every tagged
-release.
-
-You can view the available images on `Docker Hub
-<https://hub.docker.com/u/kolla/>`__ or with the Docker CLI::
-
-    $ sudo docker search kolla
+The Kolla repository is one of four deliverables of the OpenStack Kolla
+project. The four deliverables that make up the Kolla project are:
+
+========================  ======================================================
+Deliverable               Repository
+========================  ======================================================
+kolla                     https://opendev.org/openstack/kolla
+kolla-ansible             https://opendev.org/openstack/kolla-ansible
+ansible-collection-kolla  https://opendev.org/openstack/ansible-collection-kolla
+kayobe                    https://opendev.org/openstack/kayobe
+========================  ======================================================
+
+The Kolla developers publish images in the Quay.io `openstack.kolla` namespace
+for every tagged release. You can view the available images on `Quay.io
+<https://quay.io/organization/openstack.kolla>`__.
+
+.. warning::
+   Kolla(-ansible) defaults to using these images in order to ease testing and
+   demonstration setups, but they are not intended to be used beyond this.
+   In particular, they do not undergo any security scrutiny. If you intend to
+   deploy Kolla for production purposes, you are advised to create and curate your
+   own set of images using the ``kolla`` tool.
 
 OpenStack services
 ------------------
@@ -87,10 +87,10 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Manila <https://docs.openstack.org/manila/latest/>`__
 - `Masakari <https://docs.openstack.org/masakari/latest/>`__
 - `Mistral <https://docs.openstack.org/mistral/latest/>`__
-- `Monasca <https://docs.openstack.org/monasca-api/latest/>`__
 - `Neutron <https://docs.openstack.org/neutron/latest/>`__
 - `Nova <https://docs.openstack.org/nova/latest/>`__
 - `Octavia <https://docs.openstack.org/octavia/latest/>`__
+- `Placement <https://docs.openstack.org/placement/latest/>`__
 - 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/>`__
@@ -103,44 +103,35 @@ Infrastructure components
 Kolla provides images to deploy the following infrastructure components:
 
 - `Collectd <https://collectd.org>`__,
-  `InfluxDB <https://influxdata.com/time-series-platform/influxdb/>`__, and
   `Grafana <https://grafana.com>`__ for performance monitoring.
-- `Corosync <https://clusterlabs.org/corosync.html>`__ and
-  `Pacemaker <https://clusterlabs.org/pacemaker>`__ for HAcluster.
-- `Elasticsearch <https://www.elastic.co/de/products/elasticsearch>`__ and
-  `Kibana <https://www.elastic.co/products/kibana>`__ to search, analyze,
-  and visualize log messages.
 - `Cron <https://cron-job.org>`__ for log rotation.
 - `Etcd <https://etcd.io/>`__ a distributed key value store that provides
   a reliable way to store data across a cluster of machines.
 - `Fluentd <https://www.fluentd.org/>`__ as an open source data collector
   for unified logging layer.
 - `Gnocchi <https://gnocchi.xyz/>`__ a time-series storage database.
+- `Corosync <https://clusterlabs.org/corosync.html>`__ and
+  `Pacemaker <https://clusterlabs.org/pacemaker>`__ for HAcluster.
 - `HAProxy <https://www.haproxy.org/>`__ and
   `Keepalived <https://www.keepalived.org/>`__ for high availability of services
   and their endpoints.
-- `Kafka <https://kafka.apache.org/documentation/>`__ a distributed streaming
-  platform.
 - `MariaDB and Galera Cluster <https://mariadb.com/kb/en/library/galera-cluster/>`__
   for highly available MySQL databases.
 - `Memcached <https://www.memcached.org/>`__ a distributed memory object caching system.
-- `Open vSwitch <https://www.openvswitch.org/>`__ for use with Neutron.
 - MariaDB Backup A tool which provides a method of performing a hot backup of your MySQL data while the
   system is running.
+- `Open vSwitch <https://www.openvswitch.org/>`__ for use with Neutron.
+- `Opensearch <https://opensearch.org/>`__ to search, analyze,
+  and visualize log messages.
 - `Prometheus <https://prometheus.io/>`__ an open-source systems monitoring
   and alerting toolkit originally built at SoundCloud.
-- `Qdrouterd <https://qpid.apache.org/components/dispatch-router/index.html>`__ as a
-  direct messaging back end for communication between services.
 - `RabbitMQ <https://www.rabbitmq.com/>`__ as a broker messaging back end for
   communication between services.
 - `Valkey Sentinel <https://valkey.io/topics/sentinel>`__ provides high availability for valkey
   along with collateral tasks such as monitoring, notification and acts as configuration
   provider for clients.
 - `Telegraf <https://www.docs.influxdata.com/telegraf/>`__ as a plugin-driven server
   agent for collecting & reporting metrics.
-- `ZooKeeper <https://zookeeper.apache.org/>`__ as a centralized service for maintaining
-  configuration information, naming, providing distributed synchronization, and providing
-  group services.
 
 Directories
 ===========
@@ -175,14 +166,6 @@ workflow <https://docs.openstack.org/infra/manual/developers.html>`__.
    <https://docs.openstack.org/kolla/latest/contributor/meeting.html>`__.
 -  Contribute `code <https://opendev.org/openstack/kolla>`__.
 
-Contributors
-============
-
-Check out who is `contributing
-code <https://stackalytics.io/?module=kolla-group&metric=commits>`__ and
-`contributing
-reviews <https://stackalytics.io/?module=kolla-group&metric=marks>`__.
-
 Notices
 =======
 

doc/source/contributor/release-management.rst

@@ -473,7 +473,7 @@ After a branch enters EM, we typically do the following:
 
 * stop backporting fixes to the branch by default. Important fixes or those
   requested by community members may be merged if deemed appropriate
-* stop publishing images to Dockerhub
+* stop publishing images to Quay.io
 * stop actively maintaining CI
 
 End of Life (EOL)

doc/source/contributor/versions.rst

@@ -16,7 +16,6 @@ information about package sources.
  Name           Version           Package source information
 ==============  ================  =============================================
  Grafana        9.x                `Grafana install guide`_
- InfluxDB       1.8.x              `InfluxDB upstream repo`_
  Kibana         7.x                `Kibana install guide`_
  Logstash       7.x                `Logstash install guide`_
  MariaDB        10.11 (LTS)        `MariaDB Community downloads`_

doc/source/matrix_aarch64.csv

@@ -20,7 +20,6 @@ hacluster,N,U,U
 haproxy,U,U,U
 heat,U,U,U
 horizon,U,U,U
-influxdb,N,U,U
 ironic,U,U,U
 iscsid,U,U,U
 keepalived,U,U,U

doc/source/matrix_x86.csv

@@ -21,7 +21,6 @@ hacluster-pcs,N,U,U
 haproxy,T,T,U
 heat,T,T,T
 horizon,T,T,T
-influxdb,U,U,U
 ironic,T,T,U
 iscsid,T,T,U
 keepalived,T,T,U

docker/ironic/ironic-pxe/Dockerfile.j2

@@ -17,15 +17,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'ipxe-bootimgs-aarch64',
         'mtools',
         'shim-*64',
+        'syslinux-tftpboot',
         'tftp-server',
     ] %}
 
-    {% if base_arch in ['x86_64'] %}
-        {% set ironic_pxe_packages = ironic_pxe_packages + [
-            'syslinux-tftpboot'
-        ] %}
-    {% endif %}
-
 {{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
 {% elif base_package_type == 'deb' %}
     {% set ironic_pxe_packages = [

docker/kolla-toolbox/Dockerfile.j2

@@ -98,7 +98,6 @@ ENV PATH {{ venv_path }}/bin:$PATH
 {% set kolla_toolbox_pip_packages = [
         'ansible-core==2.20.*',
         'cmd2',
-        'influxdb',
         'openstacksdk',
         'os-client-config',
         'pbr',

docker/nova/nova-libvirt/Dockerfile.j2

@@ -54,6 +54,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'python3-rbd',
         'qemu-block-extra',
         'qemu-system',
+        'qemu-system-modules-spice',
         'qemu-utils',
         'sasl2-bin',
         'swtpm',

kolla/common/config.py

@@ -63,7 +63,6 @@
                     'openvswitch',
                     'proxysql',
                     'rabbitmq',
-                    'storm',
                     'tgtd',
                     'valkey',
                 ],
@@ -89,9 +88,7 @@
                     'cloudkitty',
                     'designate',
                     'gnocchi',
-                    'influxdb',
                     'ironic',
-                    'kafka',
                     'kuryr',
                     'magnum',
                     'manila',
@@ -102,7 +99,6 @@
                     'telegraf',
                     'trove',
                     'valkey',
-                    'zookeeper',
                     'zun',
                 ],
                 help='Aux Images'),
@@ -202,9 +198,7 @@
     cfg.MultiOpt('regex', types.String(), positional=True, required=False,
                  help=('Build only images matching regex and its'
                        ' dependencies')),
-    cfg.StrOpt('registry',
-               help=('The container image registry host. The default registry'
-                     ' host is Docker Hub')),
+    cfg.StrOpt('registry', help='The container image registry host'),
     cfg.StrOpt('save-dependency',
                help=('Path to the file to store the docker image'
                      ' dependency in Graphviz dot format')),

kolla/common/users.py

@@ -89,7 +89,7 @@
         'uid': 42420,
         'gid': 42420,
     },
-    'influxdb-user': {
+    'influxdb-user': {  # unused user (influxdb dropped)
         'uid': 42421,
         'gid': 42421,
     },

kolla/template/repos.yaml

@@ -161,7 +161,7 @@ rpm:
     baseurl: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/yum"
     gpgkey: "https://artifacts.opensearch.org/publickeys/opensearch-release.pgp"
     repo_gpgcheck: 1
-    name: "opensearch32.x"
+    name: "opensearch-3.x"
   opensearch-dashboards:
     baseurl: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/yum"
     gpgkey: "https://artifacts.opensearch.org/publickeys/opensearch-release.pgp"

releasenotes/notes/debian-trixie-spice-814929ed1efbcad1.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Debian Trixie container images require the additional
+    qemu-system-modules-spice operating system package for SPICE consoles
+    to function correctly. This package has therefore been added
+    to the nova-libvirt container build. Further details are available in
+    the bug report at `LP#2138186 <https://launchpad.net/bugs/2138186>`__.

releasenotes/notes/drop-influxdb-cb3161a1e04fa38e.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Support for building ``influxdb`` container images has been dropped.

releasenotes/notes/image-purpose-1884e00f993e09d0.yaml

@@ -0,0 +1,7 @@
+---
+prelude: >
+    The Kolla project publishes images to quay.io.
+    These are however only intended for demonstration and testing purposes.
+    In particular, they do not undergo any security scrutiny. If you intend to
+    deploy Kolla for production purposes, you are advised to create and curate your
+    own set of images.

releasenotes/notes/ironic-pxe-syslinux-tftpboot-3dc6415ed140dc50.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Install syslinux-tftpboot in the ironic-pxe RPM image on all architectures
+    so TFTP boot files (pxelinux.0, chain.c32, ldlinux.c32) are present on
+    aarch64.