Merge pull request #937 from hjensas/neutron-cleanup

Add support for cleanup neutron agents post adopt

Author: openshift-merge-bot[bot]

tests/roles/dataplane_adoption/tasks/main.yaml

@@ -594,6 +594,10 @@
   ansible.builtin.include_tasks:
     file: nova_verify.yaml
 
+- name: Cleanup non-adopted Neutron and OVN agents
+  ansible.builtin.include_tasks:
+    file: neutron_agents_cleanup.yaml
+
 - name: Adopted Neutron and OVN agents post-checks
   ansible.builtin.include_tasks:
     file: neutron_verify.yaml

tests/roles/dataplane_adoption/tasks/neutron_agents_cleanup.yaml

@@ -0,0 +1,27 @@
+# These tasks will delete agents that where not adopted, but replaced by
+# either a new service or a new agent running on a different host post
+# adoption.
+
+- name: delete agent type dhcp
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    alias openstack="oc exec -t openstackclient -- openstack"
+
+    AGENT_ID=$(${BASH_ALIASES[openstack]} network agent list --agent-type dhcp --host {{ item }} -f value -c ID)
+    if [ -n "${AGENT_ID}" ]; then
+      ${BASH_ALIASES[openstack]} network agent delete ${AGENT_ID}
+    fi
+  loop: "{{ neutron_dhcp_agent_cleanup_hosts | default([]) }}"
+
+- name: delete OVN Gateway agents
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    alias openstack="oc exec -t openstackclient -- openstack"
+
+    AGENT_ID=$(${BASH_ALIASES[openstack]} network agent list --agent-type ovn-controller-gateway --host {{ item }} -f value -c ID)
+    if [ -n "${AGENT_ID}" ]; then
+      ${BASH_ALIASES[openstack]} network agent delete ${AGENT_ID}
+    fi
+  loop: "{{ neutron_ovn_controller_gateway_agent_cleanup_hosts | default([]) }}"