summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitu Sood <ritu.sood@intel.com>2018-05-16 15:46:35 -0700
committerRitu Sood <ritu.sood@intel.com>2018-05-16 15:48:36 -0700
commit36eec04574e14da4bb391bbc6debf42be72db589 (patch)
treeac4757054ed31bea441a387c1f1309acf5dd3d6c
parenta950e73cd6185df6e843204c7fa69efa5e7640c1 (diff)
Ignore flavors that don't have hpa-capabilities
Multi-cloud creates some flavors without hpa-capabilities Issue-ID: OPTFRA-235 Change-Id: I4acfd6198bb0f494d0a34372d761c2dff7b4b301 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
-rw-r--r--conductor/conductor/data/plugins/inventory_provider/hpa_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/conductor/conductor/data/plugins/inventory_provider/hpa_utils.py b/conductor/conductor/data/plugins/inventory_provider/hpa_utils.py
index 41e217c..3cd2cfb 100644
--- a/conductor/conductor/data/plugins/inventory_provider/hpa_utils.py
+++ b/conductor/conductor/data/plugins/inventory_provider/hpa_utils.py
@@ -74,8 +74,8 @@ class HpaMatchProvider(object):
try:
flavor_cap_list = flavor['hpa-capabilities']
except KeyError:
- LOG.info(_LI("invalid JSON "))
- return None
+ LOG.info(_LI("hpa-capabilities not found in flavor "))
+ continue
for capability in CapabilityDataParser.get_item(flavor_cap_list,
'hpa-capability'):
hpa_list = {k: capability.item[k] \