From c35d4e2588c88d70bc8297e988eb757db280462f Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Mon, 15 Feb 2021 11:05:05 +0000 Subject: [PATCH] Fix debug logging during cluster upgrade Incorrectly formatted logging causes error. This PS fixes it. Story: 2008628 Task: 41833 Change-Id: Iac87a4a56187694d5f5b3454de380de6b6db48fa (cherry picked from commit 00f8aa5d67c03e9ff1dd828c13b25d201754eac2) --- magnum/drivers/heat/driver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/magnum/drivers/heat/driver.py b/magnum/drivers/heat/driver.py index a0bf499b51..866723af70 100755 --- a/magnum/drivers/heat/driver.py +++ b/magnum/drivers/heat/driver.py @@ -331,15 +331,17 @@ class FedoraKubernetesDriver(KubernetesDriver): LOG.debug(("Cluster template %s does not contain a " "valid kube_tag"), cluster_template.name) + # If both keys are present, only ostree_commit is chosen. for ostree_tag in ["ostree_commit", "ostree_remote"]: try: ostree_param = { ostree_tag: cluster_template.labels[ostree_tag] } heat_params.update(ostree_param) + break except KeyError: LOG.debug("Cluster template %s does not define %s", - (cluster_template.name, ostree_tag)) + cluster_template.name, ostree_tag) upgrade_labels = ['kube_tag', 'ostree_remote', 'ostree_commit'] if not any([u in heat_params.keys() for u in upgrade_labels]):