Skip to content

Commit 84ab8b2

Browse files
committed
update remove order and overlay defaults check
1 parent 4bbffdb commit 84ab8b2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

plugins/action/common/prepare_plugins/prep_001_list_defaults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def prepare(self):
130130
# Check vxlan.overlay_services list elements
131131
parent_keys = ['vxlan', 'overlay_services']
132132
dm_check = data_model_key_check(self.model_data, parent_keys)
133-
if 'overlay_services' in dm_check['keys_no_data']:
133+
if 'overlay_services' in dm_check['keys_not_found'] or 'overlay_services' in dm_check['keys_no_data']:
134134
self.model_data['vxlan']['overlay_services'] = {'vrfs': []}
135135
self.model_data['vxlan']['overlay_services'] = {'vrf_attach_groups': []}
136136
self.model_data['vxlan']['overlay_services'] = {'networks': []}

roles/dtc/remove/tasks/sub_main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@
6363
when:
6464
- changes_detected_vrfs
6565

66-
- name: Remove Fabric vPC Peering
67-
ansible.builtin.import_tasks: vpc_peers.yml
68-
tags: "{{ nac_tags.remove_vpc_peers }}"
69-
when:
70-
- changes_detected_vpc_peering
71-
7266
- name: Remove Fabric Links
7367
ansible.builtin.import_tasks: links.yml
7468
tags: "{{ nac_tags.remove_links }}"
7569
when:
7670
- changes_detected_link_vpc_peering
7771

72+
- name: Remove Fabric vPC Peering
73+
ansible.builtin.import_tasks: vpc_peers.yml
74+
tags: "{{ nac_tags.remove_vpc_peers }}"
75+
when:
76+
- changes_detected_vpc_peering
77+
7878
- name: Remove Fabric Switches
7979
ansible.builtin.import_tasks: switches.yml
8080
tags: "{{ nac_tags.remove_switches }}"

0 commit comments

Comments
 (0)