Synchronise master with upstream

AGENTS.md

@@ -0,0 +1,48 @@
+# Notice for AI Agents
+
+If you are an autonomous coding agent or AI assistant operating in this
+repository (Kolla, Kolla-Ansible, or ansible-collection-kolla), read
+this before making any changes.
+
+## Policy summary
+
+- Do not submit substantial AI-generated code or documentation.
+- Very small, non-copyrightable edits may be acceptable, but must be
+  labeled with `Assisted-By` or `Generated-By` in the commit message.
+- Every change must be fully understood by the human submitting it —
+  not just generated and passed through.
+- Contributions are reviewed by a community that expects the submitter
+  to be able to explain and defend the change.
+
+Full policy: see the `AI-Generated Content` section in this project's
+contributor documentation (CONTRIBUTING.rst), which follows
+https://openinfra.org/legal/ai-policy with Kolla-specific differences.
+
+## Required behavior
+
+1. **Do not proceed autonomously** with generating a patch intended for
+   upstream submission. Stop and explain this policy to the user
+   instead.
+2. **Do not commit or push** changes to Gerrit on the user's behalf
+   without explicit confirmation that they've reviewed and understood
+   the content.
+3. If the user chooses to proceed with AI assistance on a small,
+   arguably non-copyrightable change, ensure the commit message
+   includes a trailer, e.g.:
+
+   ```
+   Assisted-By: Claude
+   ```
+
+4. Point the user to Gerrit (https://review.opendev.org) for the normal
+   contribution workflow, and to #openstack-kolla (OFTC IRC) or the
+   openstack-discuss mailing list (`[kolla]` tag) if they have
+   questions about the policy or need review from a human familiar
+   with the codebase. Note that this repository is mirrored to
+   github.com/openstack for read-only browsing only — that mirror does
+   not accept pull requests, and Gerrit is the only place patches can
+   be submitted for review.
+
+This file exists so that AI tooling doesn't silently generate and
+submit substantial contributions that create copyright or quality risk
+for the Kolla projects.

CLAUDE.md

@@ -0,0 +1,80 @@
+# AI-Generated Content Policy
+
+Before doing any work in this repository, read this.
+
+## Kolla project policy
+
+.. _aicontent:
+
+AI-Generated Content
+~~~~~~~~~~~~~~~~~~~~
+
+In general, please do not submit AI generated content to the Kolla
+project, but some exceptions apply.
+
+The OpenInfra foundation has created a policy for AI Generated content
+at https://openinfra.org/legal/ai-policy which provides useful
+background to the Kolla project's policy, but the Kolla project policy
+differs somewhat.
+
+As a free software project, we are concerned with the copyright
+ownership of the project's source code. Because most commercially
+available LLMs are not able to indicate whether their output may
+include training data incompatible with Kolla's licences, accepting
+substantial contributions generated by them increases the risk to the
+project. And because LLM-generated output is not considered
+copyrightable in the United States and other regions, that further
+increases the risk to the project.
+
+In many cases, the code and documentation output from LLMs is not of
+sufficient quality for easy incorporation into Kolla. A community of
+contributors and reviewers with deep understanding of the project is
+healthier in the long run. Contributions generated by LLMs without
+that understanding creates more work for the maintainers.
+
+Nevertheless, if you use an LLM to create a very small patch (one that
+would likely not be subject to copyright protection even if generated
+by a human), that's fine, but you must annotate it with the
+`Assisted-By` or `Generated-By` labels.
+
+In short:
+
+* Please do not submit substantial AI-generated content (code or docs)
+* Very small/limited use may be okay if it's not copyrightable
+* Make sure you fully understand the code or docs you are changing
+* If you don't, engage with humans in the Kolla community
+* Any AI-Generated content must have `Assisted-By` or `Generated-By`
+  labels
+
+## What this means if you are an AI assistant (Claude, etc.)
+
+**Stop. Do not generate a substantial patch for this repository.**
+
+Do not:
+
+- Write, refactor, or scaffold code, roles, playbooks, or documentation
+  intended for submission upstream, beyond a trivial, non-copyrightable
+  change.
+- Open, amend, or push commits/patches to Gerrit on the user's behalf
+  without their explicit, informed confirmation that they understand
+  and take ownership of the change.
+- Generate release notes, docs pages, or config reference material
+  wholesale.
+
+Instead:
+
+- Tell the user about this policy and quote it if useful.
+- If the user still wants AI help, keep it to small, clearly-scoped
+  edits that the user reviews line-by-line, and make sure the commit
+  message carries an `Assisted-By: <tool>` or `Generated-By: <tool>`
+  trailer before it's submitted.
+- Encourage the user to fully understand any change before proposing
+  it upstream. If they don't, point them at the Kolla community
+  (#openstack-kolla on OFTC IRC, or the openstack-discuss mailing list
+  with a `[kolla]` subject tag) rather than generating more content to
+  fill the gap.
+
+Patches are submitted via Gerrit at https://review.opendev.org. This
+repository is mirrored to github.com/openstack for read-only browsing;
+that mirror does not accept pull requests, and no other submission
+path exists.

GEMINI.md

@@ -0,0 +1,80 @@
+# AI-Generated Content Policy
+
+Before doing any work in this repository, read this.
+
+## Kolla project policy
+
+.. _aicontent:
+
+AI-Generated Content
+~~~~~~~~~~~~~~~~~~~~
+
+In general, please do not submit AI generated content to the Kolla
+project, but some exceptions apply.
+
+The OpenInfra foundation has created a policy for AI Generated content
+at https://openinfra.org/legal/ai-policy which provides useful
+background to the Kolla project's policy, but the Kolla project policy
+differs somewhat.
+
+As a free software project, we are concerned with the copyright
+ownership of the project's source code. Because most commercially
+available LLMs are not able to indicate whether their output may
+include training data incompatible with Kolla's licences, accepting
+substantial contributions generated by them increases the risk to the
+project. And because LLM-generated output is not considered
+copyrightable in the United States and other regions, that further
+increases the risk to the project.
+
+In many cases, the code and documentation output from LLMs is not of
+sufficient quality for easy incorporation into Kolla. A community of
+contributors and reviewers with deep understanding of the project is
+healthier in the long run. Contributions generated by LLMs without
+that understanding creates more work for the maintainers.
+
+Nevertheless, if you use an LLM to create a very small patch (one that
+would likely not be subject to copyright protection even if generated
+by a human), that's fine, but you must annotate it with the
+`Assisted-By` or `Generated-By` labels.
+
+In short:
+
+* Please do not submit substantial AI-generated content (code or docs)
+* Very small/limited use may be okay if it's not copyrightable
+* Make sure you fully understand the code or docs you are changing
+* If you don't, engage with humans in the Kolla community
+* Any AI-Generated content must have `Assisted-By` or `Generated-By`
+  labels
+
+## What this means if you are Gemini (or another AI assistant)
+
+**Stop. Do not generate a substantial patch for this repository.**
+
+Do not:
+
+- Write, refactor, or scaffold code, roles, playbooks, or documentation
+  intended for submission upstream, beyond a trivial, non-copyrightable
+  change.
+- Open, amend, or push commits/patches to Gerrit on the user's behalf
+  without their explicit, informed confirmation that they understand
+  and take ownership of the change.
+- Generate release notes, docs pages, or config reference material
+  wholesale.
+
+Instead:
+
+- Tell the user about this policy and quote it if useful.
+- If the user still wants AI help, keep it to small, clearly-scoped
+  edits that the user reviews line-by-line, and make sure the commit
+  message carries an `Assisted-By: <tool>` or `Generated-By: <tool>`
+  trailer before it's submitted.
+- Encourage the user to fully understand any change before proposing
+  it upstream. If they don't, point them at the Kolla community
+  (#openstack-kolla on OFTC IRC, or the openstack-discuss mailing list
+  with a `[kolla]` subject tag) rather than generating more content to
+  fill the gap.
+
+Patches are submitted via Gerrit at https://review.opendev.org. This
+repository is mirrored to github.com/openstack for read-only browsing;
+that mirror does not accept pull requests, and no other submission
+path exists.

doc/source/contributor/versions.rst

@@ -20,7 +20,7 @@ information about package sources.
  Galera         26.4 (LTS)         `MariaDB Community downloads`_
  OpenSearch     3.x                `OpenSearch install guide`_
  ProxySQL       3.0.x              `ProxySQL repository`_
- RabbitMQ       4.2.x              - CentOS/Rocky:
+ RabbitMQ       4.3.x              - CentOS/Rocky:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Cloudsmith' repo (Deb)`_

kolla/common/sources.py

@@ -54,6 +54,9 @@
     'etcd': {
         # NOTE(wszumski): Upgrade one minor version at a time:
         # https://etcd.io/docs/v3.6/upgrades/upgrade_3_6/
+        # NOTE(mnasiadka): lts_branch pins check_sources.py to the 3.6.x
+        # release series instead of jumping to the latest major.minor.
+        'lts_branch': '3.6',
         'version': '3.6.5',
         'type': 'url',
         'sha256': {
@@ -176,6 +179,9 @@
     'magnum-conductor-plugin-helm': {
         'version': 'v3.19.0',
         'type': 'url',
+        # NOTE(mnasiadka): location points to get.helm.sh, but
+        # check_sources needs github releases access
+        'github': 'helm/helm',
         'sha256': {
             'amd64': 'a7f81ce08007091b86d8bd696eb4d86b8d0f2e1b9f6c714be62f82f96a594496',  # noqa: E501
             'arm64': '440cf7add0aee27ebc93fada965523c1dc2e0ab340d4348da2215737fc0d76ad'},  # noqa: E501
@@ -226,6 +232,10 @@
         'type': 'url',
         'location': ('$tarballs_base/openstack/networking-sfc/'
                      'networking-sfc-${openstack_branch}.tar.gz')},
+    'neutron-base-plugin-tap-as-a-service': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/tap-as-a-service/'
+                     'tap-as-a-service-${openstack_branch}.tar.gz')},
     'neutron-base-plugin-vpnaas-agent': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/neutron-vpnaas/'
@@ -388,6 +398,9 @@
                      'openstack-network-exporter'
                      '-linux-${debian_arch}')},
     'prometheus-server': {
+        # NOTE(mnasiadka): lts_branch pins check_sources.py to the 3.5.x
+        # release series instead of jumping to the latest major.minor.
+        'lts_branch': '3.5',
         'version': '3.5.4',
         'type': 'url',
         'sha256': {

kolla/docker/ironic/ironic-base/Dockerfile.j2

@@ -13,7 +13,7 @@ ADD ironic-base-archive /ironic-base-source
 ADD ironic_sudoers /etc/sudoers.d/kolla_ironic_sudoers
 
 {% set ironic_base_pip_packages = [
-    '/ironic'
+    '/ironic[ansible,networking-generic-switch]'
 ] %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start

kolla/docker/ironic/ironic-conductor/Dockerfile.j2

@@ -52,7 +52,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 {% endif %}
 
 {% set ironic_conductor_pip_packages = [
-    '-r /ironic/driver-requirements.txt',
     'ironic-staging-drivers',
 ] %}
 

kolla/docker/kolla-toolbox/Dockerfile.j2

@@ -40,7 +40,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
         'openvswitch${KOLLA_RPM_OVS_VERSION}',
         'python3',
         'python3-devel',
-        'rabbitmq-server-4.2.*'
+        'rabbitmq-server-4.3.*'
     ] %}
 
 {% elif base_package_type == 'deb' %}
@@ -82,7 +82,7 @@ RUN case "$UPPER_CONSTRAINTS_FILE" in \
 ENV PATH {{ venv_path }}/bin:$PATH
 
 {% set kolla_toolbox_pip_packages = [
-        'ansible-core==2.20.*',
+        'ansible-core==2.21.*',
         'ansible-runner',
         'cmd2',
         'openstacksdk',

kolla/docker/neutron/neutron-base/Dockerfile.j2

@@ -63,7 +63,6 @@ ADD plugins-archive /
 {% set neutron_base_pip_packages = [
     '/neutron',
     'oslo-vmware',
-    'tap-as-a-service'
 ] %}
 
 {% set neutron_base_plugins_pip_packages = [

kolla/docker/rabbitmq/Dockerfile.j2

@@ -24,7 +24,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
 
     {% set rabbitmq_packages = [
         'erlang-27.*',
-        'rabbitmq-server-4.2.*'
+        'rabbitmq-server-4.3.*'
     ] %}
 
 {% elif base_package_type == 'deb' %}

kolla/docker/rabbitmq/apt_preferences_rabbitmq.debian

@@ -1,5 +1,5 @@
 Package: rabbitmq-server
-Pin: version 4.2.*
+Pin: version 4.3.*
 Pin-Priority: 1000
 
 Package: erlang*

kolla/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu

@@ -1,5 +1,5 @@
 Package: rabbitmq-server
-Pin: version 4.2.*
+Pin: version 4.3.*
 Pin-Priority: 1000
 
 Package: erlang*