Merge pull request #583 from openstack-charmers/fix-overlay-for-templ…

…ated-bundles Fix deploy for templated bundles
openstack-charmers · Nov 14, 2022 · 752e021 · 752e021
2 parents a7faa9a + e7b296e
commit 752e021
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/unit_tests/test_zaza_charm_lifecycle_deploy.py b/unit_tests/test_zaza_charm_lifecycle_deploy.py
@@ -336,6 +336,8 @@ def test_deploy_bundle(self):
             './tests/bundles/bionic.yaml',
             'newmodel',
             force=True)
+        self.render_overlays.assert_called_once_with(
+            './tests/bundles/bionic.yaml', '/tmp/mytmpdir', model_ctxt=None)
         self.check_output_logging.assert_called_once_with(
             ['juju', 'deploy', '-m', 'newmodel', '--force',
              './tests/bundles/bionic.yaml'])
@@ -378,6 +380,8 @@ def test_deploy_bundle_template(self):
             './tests/bundles/bionic.yaml',
             'newmodel',
             force=True)
+        self.render_overlays.assert_called_once_with(
+            '/tmp/mytmpdir/bionic.yaml', '/tmp/mytmpdir', model_ctxt=None)
         self.check_output_logging.assert_called_once_with(
             ['juju', 'deploy', '-m', 'newmodel', '--force',
              '/tmp/mytmpdir/bionic.yaml'])

diff --git a/zaza/charm_lifecycle/deploy.py b/zaza/charm_lifecycle/deploy.py
@@ -338,8 +338,8 @@ def deploy_bundle(bundle, model, model_ctxt=None, force=False, trust=False):
         cmd.append('--force')
     if trust:
         cmd.append('--trust')
+    bundle_out = None
     with tempfile.TemporaryDirectory() as tmpdirname:
-        bundle_out = '{}/{}'.format(tmpdirname, os.path.basename(bundle))
         # Bundle templates should only exist in the bundle directory so
         # explicitly set the Jinja2 load path.
         bundle_template = get_template(
@@ -351,11 +351,12 @@ def deploy_bundle(bundle, model, model_ctxt=None, force=False, trust=False):
                     "Found bundle template ({}) and bundle ({})".format(
                         bundle_template.filename,
                         bundle))
+            bundle_out = '{}/{}'.format(tmpdirname, os.path.basename(bundle))
             render_template(bundle_template, bundle_out, model_ctxt=model_ctxt)
             cmd.append(bundle_out)
         else:
             cmd.append(bundle)
-        for overlay in render_overlays(bundle, tmpdirname,
+        for overlay in render_overlays(bundle_out or bundle, tmpdirname,
                                        model_ctxt=model_ctxt):
             logging.info("Deploying overlay '{}' on to '{}' model"
                          .format(overlay, model))