Merge pull request #385 from stackhpc/upstream/2024.1-2025-02-24

Synchronise 2024.1 with upstream

Author: priteau

.zuul.d/project.yaml

@@ -8,3 +8,9 @@
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - periodic-stable-jobs
+    check:
+      jobs:
+        - kolla-tox-genconfig
+    gate:
+      jobs:
+        - kolla-tox-genconfig

.zuul.d/tox.yaml

@@ -0,0 +1,12 @@
+---
+- job:
+    name: kolla-tox-genconfig
+    parent: openstack-tox
+    timeout: 2400
+    description: |
+
+      Run genconfig
+
+      Uses tox with the ``genconfig`` environment.
+    vars:
+      tox_envlist: genconfig

kolla/common/config.py

@@ -296,20 +296,29 @@
 
 def get_source_opts(type_=None, location=None, reference=None, enabled=True,
                     version=None, sha256=None):
-    return [cfg.StrOpt('type', choices=['local', 'git', 'url'],
+    return [cfg.StrOpt('type',
+                       choices=['local', 'git', 'url'],
                        default=type_,
                        help='Source location type'),
-            cfg.StrOpt('location', default=location,
+            cfg.StrOpt('location',
+                       default=location,
                        help='The location for source install'),
-            cfg.StrOpt('reference', default=reference,
+            cfg.StrOpt('reference',
+                       default=reference,
                        help=('Git reference to pull, commit sha, tag '
                              'or branch name')),
-            cfg.BoolOpt('enabled', default=enabled,
+            cfg.BoolOpt('enabled',
+                        default=enabled,
                         help=('Whether the source is enabled')),
-            cfg.StrOpt('version', default=version,
+            cfg.StrOpt('version',
+                       default=version,
                        help=('Package version to download for GitHub '
                              'sources')),
-            cfg.DictOpt('sha256', default=sha256)]
+            cfg.DictOpt('sha256',
+                        default=sha256,
+                        help=('Dictionary of sha256 sums for GitHub '
+                              'sources')),
+            ]
 
 
 def get_user_opts(uid, gid, group):

tox.ini

@@ -1,12 +1,11 @@
 [tox]
 minversion = 3.18
-skipsdist = True
 envlist = pep8,py310-{docker,podman}
 ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
-usedevelop=True
+usedevelop = True
 allowlist_externals = find
                       rm
 deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}