openstack
/
magnum
Code Issues Proposed changes

Merge "Fix addon tag/version parsing"

This commit is contained in:
Zuul 2019-08-26 11:36:39 +00:00 committed by Gerrit Code Review
parent efff708625 b3a183dc50
commit 3e665ed0d9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
magnum/drivers/k8s_fedora_atomic_v1/driver.py
View File

@ -56,9 +56,15 @@ class Driver(driver.KubernetesDriver):
if ((label.endswith('_tag') or if ((label.endswith('_tag') or
label.endswith('_version')) and label in heat_params): label.endswith('_version')) and label in heat_params):
current_addons[label] = heat_params[label] current_addons[label] = heat_params[label]
if (SV.from_pip_string(new_addons[label]) < try:
SV.from_pip_string(current_addons[label])): if (SV.from_pip_string(new_addons[label]) <
raise exception.InvalidVersion(tag=label) SV.from_pip_string(current_addons[label])):
raise exception.InvalidVersion(tag=label)
except Exception as e:
# NOTE(flwang): Different cloud providers may use different
# tag/version format which maybe not able to parse by
# SemanticVersion. For this case, let's just skip it.
LOG.debug("Failed to parse tag/version %s", str(e))
heat_params["server_image"] = cluster_template.image_id heat_params["server_image"] = cluster_template.image_id
heat_params["master_image"] = cluster_template.image_id heat_params["master_image"] = cluster_template.image_id