Fix merge from master conflicts

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
index 98c8882..0773e8a 100644 (file)
--- 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):