diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-07-26 08:36:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-26 08:36:27 +0000 |
| commit | 9c78f17d3bf2aeab4e705eb6206f01d400f280f1 (patch) | |
| tree | c9409187311a81824a53d1abecff245bf9727838 | |
| parent | 4d2cd26d7878f1abaebd018d02ab21daf8445e11 (diff) | |
| parent | 9676e3fa9f44e6ebc36ac4c4db874c4ff0bb51a8 (diff) | |
Merge "Fix default value for plugin metadata"
| -rw-r--r-- | deploy/deploy-config.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py index 65d51b228..226e3d59e 100644 --- a/deploy/deploy-config.py +++ b/deploy/deploy-config.py @@ -101,13 +101,10 @@ def merge_fuel_plugin_version_list(list1, list2): # When the plugin version in not there in list1 it will # not be copied for e_l1 in list1: - plugin_version = e_l1.get('metadata', - {'plugin_version', None}).get('plugin_version') + plugin_version = e_l1.get('metadata', {}).get('plugin_version') plugin_version_found = False for e_l2 in list2: - if plugin_version == e_l2.get('metadata', - {'plugin_version', - None}).get('plugin_version'): + if plugin_version == e_l2.get('metadata', {}).get('plugin_version'): final_list.append(dict(mergedicts(e_l1, e_l2))) plugin_version_found = True if not plugin_version_found: |