X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=merge.py;h=7805b6407ba68d16c7994f48d7bb73f4f637f9f9;hb=6defee322c98894b3229b2f32ef1f1e1695e77c1;hp=5d634d61a687131a1e6d1c5a6b3260292461bfb3;hpb=c7ef3cc3b0c0fdce4c2634fbcf855c1bc8fe5c44;p=apex-tripleo-heat-templates.git diff --git a/merge.py b/merge.py index 5d634d61..7805b640 100644 --- a/merge.py +++ b/merge.py @@ -82,6 +82,11 @@ def fix_ref(item, old, new): new_list[0] = new item[k] = new_list continue + if k == 'AllowedResources' and isinstance(v, list) and old in v: + while old in v: + pos = v.index(old) + v[pos] = new + continue fix_ref(v, old, new) elif isinstance(item, list): copy_item = list(item)