Merge "bifrost: Populate bifrost host vars on deprovision" into stabl…

…e/yoga
stackhpc · Oct 17, 2023 · 0ff603c · 0ff603c
2 parents 8e93ecc + f609ae2
commit 0ff603c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py
@@ -1080,7 +1080,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
@@ -1241,6 +1241,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/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>`__
+