Browse Source

Merge "Fix debug logging during cluster upgrade" into stable/ussuri

stable/ussuri
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
64a8941936
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      magnum/drivers/heat/driver.py

+ 3
- 1
magnum/drivers/heat/driver.py View File

@ -330,15 +330,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]):


Loading…
Cancel
Save