Merge pull request #190 from stackhpc/upstream/zed-2023-10-18

Synchronise zed with upstream
stackhpc · Oct 18, 2023 · 87f14fc · 87f14fc
2 parents 6d32173 + a1a1f8d
commit 87f14fc
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 13 deletions.
diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py
@@ -1106,7 +1106,8 @@ class OvercloudDeprovision(KayobeAnsibleMixin, VaultMixin, Command):
 
     def take_action(self, parsed_args):
         self.app.LOG.debug("Deprovisioning overcloud")
-        playbooks = _build_playbook_list("overcloud-deprovision")
+        playbooks = _build_playbook_list("kolla-bifrost-hostvars",
+                                         "overcloud-deprovision")
         self.run_kayobe_playbooks(parsed_args, playbooks)
 
 

diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py
@@ -1247,6 +1247,8 @@ def test_overcloud_deprovision(self, mock_run):
             mock.call(
                 mock.ANY,
                 [
+                    utils.get_data_files_path(
+                        "ansible", "kolla-bifrost-hostvars.yml"),
                     utils.get_data_files_path(
                         "ansible", "overcloud-deprovision.yml"),
                 ],

diff --git a/kayobe/utils.py b/kayobe/utils.py
@@ -14,6 +14,8 @@
 
 import base64
 import glob
+from importlib.metadata import Distribution
+import json
 import logging
 import os
 import shutil
@@ -48,10 +50,30 @@ def _detect_install_prefix(path):
     return prefix_path
 
 
+def _get_direct_url(dist):
+    direct_url = os.path.join(dist._path, 'direct_url.json')
+    if os.path.isfile(direct_url):
+        with open(direct_url, 'r') as f:
+            direct_url_content = json.loads(f.readline().strip())
+            url = direct_url_content['url']
+            prefix = 'file://'
+            if url.startswith(prefix):
+                return url[len(prefix):]
+
+    return None
+
+
 def _get_base_path():
     override = os.environ.get("KAYOBE_DATA_FILES_PATH")
     if override:
         return os.path.join(override)
+
+    kayobe_dist = list(Distribution.discover(name="kayobe"))
+    if kayobe_dist:
+        direct_url = _get_direct_url(kayobe_dist[0])
+        if direct_url:
+            return direct_url
+
     egg_glob = os.path.join(
         sys.prefix, 'lib*', 'python*', '*-packages', 'kayobe.egg-link'
     )

diff --git a/releasenotes/notes/bifrost-host-vars-deprovision-525c450cf20f7f71.yaml b/releasenotes/notes/bifrost-host-vars-deprovision-525c450cf20f7f71.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes failure to run ``kayobe overcloud deprovision`` after Bifrost is
+    redeployed.
+    `LP#2038889 <https://bugs.launchpad.net/kolla-ansible/+bug/2038889>`__
+
diff --git a/releasenotes/notes/editable-install-data-file-path-743b7a85a5f5db6d.yaml b/releasenotes/notes/editable-install-data-file-path-743b7a85a5f5db6d.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes detection of data file path when using editable installations with a
+    recent pip.
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
@@ -13,16 +13,12 @@
         - kayobe-tox-molecule
         - kayobe-overcloud-rocky9
         - kayobe-overcloud-centos9s
-        # NOTE(mattcrees): Job temporarily disabled until fix is merged, see:
-        # https://review.opendev.org/c/openstack/kolla/+/885857
-        # - kayobe-overcloud-ubuntu-jammy
+        - kayobe-overcloud-ubuntu-jammy
         - kayobe-overcloud-tls-rocky9
         - kayobe-overcloud-host-configure-rocky9
         - kayobe-overcloud-host-configure-centos9s
         - kayobe-overcloud-host-configure-ubuntu-jammy
-        # NOTE(mattcrees): Job temporarily disabled until fix is merged, see:
-        # https://review.opendev.org/c/openstack/kolla/+/885857
-        # - kayobe-overcloud-upgrade-ubuntu-focal
+        - kayobe-overcloud-upgrade-ubuntu-focal
         - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-jammy
         - kayobe-seed-images-rocky9
@@ -38,15 +34,11 @@
         - kayobe-tox-ansible
         - kayobe-tox-molecule
         - kayobe-overcloud-rocky9
-        # NOTE(mattcrees): Job temporarily disabled until fix is merged, see:
-        # https://review.opendev.org/c/openstack/kolla/+/885857
-        # - kayobe-overcloud-ubuntu-jammy
+        - kayobe-overcloud-ubuntu-jammy
         - kayobe-overcloud-tls-rocky9
         - kayobe-overcloud-host-configure-rocky9
         - kayobe-overcloud-host-configure-ubuntu-jammy
-        # NOTE(mattcrees): Job temporarily disabled until fix is merged, see:
-        # https://review.opendev.org/c/openstack/kolla/+/885857
-        # - kayobe-overcloud-upgrade-ubuntu-focal
+        - kayobe-overcloud-upgrade-ubuntu-focal
         - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-jammy
         - kayobe-seed-upgrade-ubuntu-focal