diff options
| author |   Fedor Zhadaev <fzhadaev@mirantis.com> | 2016-07-20 08:46:42 +0300 |
|---|---|---|
| committer | Fedor Zhadaev <fzhadaev@mirantis.com> | 2016-07-20 08:46:42 +0300 |
| commit | 9676e3fa9f44e6ebc36ac4c4db874c4ff0bb51a8 (patch) | |
| tree | f4e15d22dc9743d9c8b8871dfb3b87eecbd3df6f | |
| parent | 264623809055c5ade26fc615d1255302f0b7c305 (diff) | |
Fix default value for plugin metadata
Fix typo which result in error while getting default metadata
in case if it's not overridden in scenario.
Fixes https://jira.opnfv.org/browse/FUEL-151
Change-Id: Ibf40f846919155e27da5dc1f778f72afee79ff12
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
| -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: |