From b9ffecd8dcdd6a311673a0e38f9b051230a88b8a Mon Sep 17 00:00:00 2001 From: tierno Date: Thu, 8 Oct 2020 08:11:44 +0000 Subject: [PATCH] fix 1238. Fix other error at commit 9405d17 Change-Id: I9fcd19ff7e5e8654de9b3d692d07a4bef58bf2fd Signed-off-by: tierno --- RO/osm_ro/nfvo.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/RO/osm_ro/nfvo.py b/RO/osm_ro/nfvo.py index d63ebf5b..a7b15a29 100644 --- a/RO/osm_ro/nfvo.py +++ b/RO/osm_ro/nfvo.py @@ -4172,7 +4172,7 @@ def instantiate_vnf(mydb, sce_vnf, params, params_out, rollbackList): if RO_pub_key: cloud_config_vm = unify_cloud_config(cloud_config_vm, {"key-pairs": [RO_pub_key]}) if vm.get("boot_data"): - cloud_config_vm_ = cloud_config_vm = unify_cloud_config(vm["boot_data"], cloud_config_vm) + cloud_config_vm = unify_cloud_config(vm["boot_data"], cloud_config_vm) if myVMDict.get('availability_zone'): av_index = vnf_availability_zones.index(myVMDict['availability_zone']) @@ -4181,7 +4181,9 @@ def instantiate_vnf(mydb, sce_vnf, params, params_out, rollbackList): for vm_index in range(0, vm.get('count', 1)): if vm.get("instance_parameters") and vm["instance_parameters"].get("cloud_init"): cloud_config_vm_ = unify_cloud_config(cloud_config_vm, - {"user-data": vm["instance_parameters"]["cloud_init"][vm_index]}) + {"user-data": vm["instance_parameters"]["cloud_init"][vm_index]}) + else: + cloud_config_vm_ = cloud_config_vm vm_name = myVMDict['name'] + "-" + str(vm_index+1) vm_networks = deepcopy(myVMDict['networks']) -- 2.17.1