From 2956ee7da07be886d7f26f706e6fa872d60fee2b Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Mon, 6 Feb 2017 17:09:38 +0530 Subject: [PATCH] Fix merge issue Signed-off-by: Philip Joseph --- .../plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py index ba248e19..e3f3ac70 100644 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py @@ -846,7 +846,7 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): OpenmanoNSRecordState.__members__.items() \ if member.value == state.value] - def create_nsr(self, nsr_config_msg, nsd_msg, key_pairs=None): + def create_nsr(self, nsr_config_msg, nsd_msg, key_pairs=None, ssh_key=None): """ Create Network service record """ -- 2.25.1