Merge pull request #433 from stackhpc/upstream/master-2025-06-30

Synchronise master with upstream

Author: priteau

docker/base/set_configs.py

@@ -68,6 +68,10 @@ class ConfigFileCommandDiffers(ExitingException):
     pass
 
 
+class StateMismatch(ExitingException):
+    pass
+
+
 class ConfigFile(object):
 
     def __init__(self, source, dest, owner=None, perm=None, optional=False,
@@ -583,6 +587,56 @@ def execute_command_check(config):
 
 
 def execute_config_check(config):
+    """Check configuration state consistency and validate config file entries.
+
+    This function compares the current config file destinations from the
+    provided config dictionary with those stored in the defaults state file.
+    If any destinations are found in the state file but not in the config,
+    a StateMismatch exception is raised. These missing files would otherwise
+    be restored or removed depending on their backup state.
+
+    After validating consistency, the function performs standard checks on
+    each declared configuration file, including content, permissions, and
+    ownership validation.
+
+    Args:
+        config (dict): The configuration dictionary containing 'config_files'
+        entries as expected by Kolla.
+
+    Raises:
+        StateMismatch: If there are entries in the defaults state not present
+        in the provided config.
+    """
+    state = get_defaults_state()
+
+    # Build a set of all current destination paths from config.json
+    # If the destination is a directory, we append the
+    # basename of the source
+    current_dests = {
+        entry['dest'] if not entry['dest'].endswith('/') else
+        os.path.join(entry['dest'], os.path.basename(entry['source']))
+        for entry in config.get('config_files', [])
+        if entry.get('dest')
+    }
+
+    # Detect any paths that are present in the state file but
+    # missing from config.json.
+    # These would be either restored (if state[dest] has a backup)
+    # or removed (if dest is null)
+    removed_dests = [
+        path for path in state.keys()
+        if path not in current_dests
+    ]
+
+    if removed_dests:
+        raise StateMismatch(
+            f"The following config files are tracked in state but missing "
+            f"from config.json. "
+            f"They would be restored or removed: {sorted(removed_dests)}"
+        )
+
+    # Perform the regular content, permissions, and ownership
+    # checks on the declared files
     for data in config.get('config_files', []):
         config_file = ConfigFile(**data)
         config_file.check()

docker/glance/glance-api/Dockerfile.j2

@@ -9,11 +9,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
     {% set glance_api_packages = [
+        'lsscsi',
         'device-mapper-multipath',
         'qemu-img'
     ] %}
 {% elif base_package_type == 'deb' %}
     {% set glance_api_packages = [
+        'lsscsi',
         'multipath-tools',
         'nfs-common',
         'qemu-utils'

docker/keystone/keystone/extend_start.sh

@@ -47,4 +47,3 @@ fi
 
 . /usr/local/bin/kolla_httpd_setup
 
-ARGS="-DFOREGROUND"

docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2

@@ -2,9 +2,7 @@
 
 set -e
 
-rabbitmq-diagnostics -t 5 -q ping || exit 1
-rabbitmq-diagnostics -t 5 -q status || exit 1
-rabbitmq-diagnostics -t 5 -q check_running || exit 1
-rabbitmq-diagnostics -t 5 -q check_local_alarms || exit 1
-rabbitmq-diagnostics -t 5 -q check_port_connectivity || exit 1
-rabbitmq-diagnostics -t 5 -q check_virtual_hosts || exit 1
+for check in ping status check_running check_local_alarms check_port_connectivity check_virtual_hosts; do
+    echo "Running rabbitmq-diagnostics $check"
+    rabbitmq-diagnostics -t 5 -q $check || (echo "ERROR: $check failed" && exit 1)
+done

docker/rabbitmq/healthcheck_rabbitmq

@@ -383,17 +383,6 @@
                      'releases/download/v${version}/'
                      'openstack-exporter'
                      '_${version}_linux_${debian_arch}.tar.gz')},
-    'prometheus-ovn-exporter': {
-        'version': '1.0.7',
-        'type': 'url',
-        'sha256': {
-            'amd64': '38d9874ddca1581574a7fa0a28ea53447a57dada37bb1385adeb766e6e819de0',  # noqa: E501
-            'arm64': 'e03f6a5ab4cf2855a498697026981273ce3c9ff16bd9bb6c97fd7f1344ec2067'},  # noqa: E501
-        'location': ('https://github.com/'
-                     'greenpau/ovn_exporter/'
-                     'releases/download/v${version}/'
-                     'ovn-exporter'
-                     '_${version}_linux_${debian_arch}.tar.gz')},
     'prometheus-server': {
         'version': '3.2.1',
         'type': 'url',

kolla/common/sources.py

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes set_configs.py not detecting removed config files
+    during --check, which prevented container restart when
+    needed. `LP#2114173 <https://launchpad.net/bugs/2114173>`__

releasenotes/notes/bug-2114173-70d0b815a42ae239.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix using Cinder as Glance image store when Cinder uses a FC or iSCSI
+    backend by adding the missing ``lsscsi`` package to glance-api.
+    `LP#2111828 <https://bugs.launchpad.net/kolla/+bug/2111828>`__

releasenotes/notes/fix-glance-api-add-missing-lsscsi-package-e6ae949eb8bdbe7b.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The OVN exporter has been removed with immediate effect since 1) it isn't
+    used in Kolla Ansible and 2) the source repo was archived in Dec 2024.

releasenotes/notes/remove-prometheus-ovn-exporter-c5f5005b4d1a4b12.yaml

@@ -892,3 +892,47 @@ def test_handle_defaults_state_exist_config_restored(
 
         # Verify that the updated state was saved
         mock_set_defaults_state.assert_called_once_with(expected_state)
+
+
+class ExecuteConfigCheckStateMismatchTest(base.BaseTestCase):
+
+    @mock.patch.object(set_configs, 'get_defaults_state')
+    def test_execute_config_check_raises_state_mismatch(
+        self, mock_get_defaults_state
+    ):
+        """Test execute_config_check() when state has extra config file.
+
+        This test simulates the scenario where the state file contains
+        a destination that no longer exists in config.json. It verifies:
+        - get_defaults_state() returns a state with an extra entry.
+        - execute_config_check() raises StateMismatch when config.json
+          omits a tracked destination.
+        """
+        config = {
+            "command": "/bin/true",
+            "config_files": [
+                {
+                    "source": "/etc/foo/foo.conf",
+                    "dest": "/etc/foo/foo.conf",
+                    "owner": "user1",
+                    "perm": "0644"
+                }
+            ]
+        }
+
+        mock_get_defaults_state.return_value = {
+            "/etc/foo/foo.conf": {
+                "source": "/etc/foo/foo.conf",
+                "preserve_properties": True,
+                "dest": "/etc/kolla/defaults/etc/foo/foo.conf"
+            },
+            "/etc/old/obsolete.conf": {
+                "source": "/etc/old/obsolete.conf",
+                "preserve_properties": True,
+                "dest": "/etc/kolla/defaults/etc/old/obsolete.conf"
+            }
+        }
+
+        self.assertRaises(set_configs.StateMismatch,
+                          set_configs.execute_config_check,
+                          config)