From c4595ebbad5596bca72c9371f8c2c52dd2eae6dc Mon Sep 17 00:00:00 2001
From: Philip Joseph <philip.joseph@riftio.com>
Date: Thu, 23 Feb 2017 18:10:18 +0530
Subject: [PATCH] Fix merge from master conflicts

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
---
 .../rift/tasklets/rwconmantasklet/rwconman_config.py      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
index 98c88829..0773e8ac 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
@@ -1216,9 +1216,11 @@ class ConfigManagerConfig(object):
                                               vnfd.name,
                                               'vnfd')
 
-            except KeyError as e:
-                self._log.debug("Did not find initial config: {}".
-                                format(e))
+                yield from self.process_initial_config(nsr_obj,
+                                                       conf.as_dict(),
+                                                       script,
+                                                       vnfr_name=vnfr_name)
+
 
 
 class ConfigManagerNSR(object):
-- 
2.25.1