commit 77c159edb9271e2d4e0a8cc0ab76192fd101c618
author tierno <alfonso.tiernosepulveda@telefonica.com> Wed Oct 07 16:47:44 2020 +0000
committer tierno <alfonso.tiernosepulveda@telefonica.com> Fri Oct 16 09:05:32 2020 +0000
tree 020bf57adfcbf1edff5c180fa25a25dca9118939
parent 3eb76f86fe6771f8d278fd3c61b69c8219a9fb06

fix 1238. Fix error introduced at commit 9405d17

Change-Id: I123a16cee0d867c048d9bc0e52242ce12d7f150f
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

RO/osm_ro/nfvo.py

diff --git a/RO/osm_ro/nfvo.py b/RO/osm_ro/nfvo.py
index ca73a09..d63ebf5 100644
--- a/RO/osm_ro/nfvo.py
+++ b/RO/osm_ro/nfvo.py
@@ -4172,7 +4172,7 @@
             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 = unify_cloud_config(vm["boot_data"], cloud_config_vm)
+            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'])
@@ -4932,8 +4932,8 @@
                                 "item": "instance_wim_nets", "item_id": db_vm_iface["instance_wim_net_id"]}})
                     task_params_copy = deepcopy(task_params)
                     cloud_config_vm = task_params_copy[6] or {}
-                    cloud_config_vm.pop("user-data", None)
                     if vdu.get("cloud_init"):
+                        cloud_config_vm.pop("user-data", None)
                         cloud_config_vm_ = unify_cloud_config(cloud_config_vm, {"user-data": vdu["cloud_init"][index]})
                         task_params_copy[6] = cloud_config_vm_
                     for iface in task_params_copy[5]: