Merge pull request #935 from Akrog/fix-network-edpm_deploy_cleanup

Remove network agents on cleanup

Author: openshift-merge-bot[bot]

Makefile

@@ -843,6 +843,7 @@ edpm_deploy_cleanup: namespace ## cleans up the edpm instance, Does not affect t
 	$(eval $(call vars,$@,dataplane))
 	oc kustomize ${DEPLOY_DIR} | oc delete --ignore-not-found=true -f -
 	${CLEANUP_DIR_CMD} ${OPERATOR_BASE_DIR}/openstack-operator ${DEPLOY_DIR}
+	bash scripts/cleanup-edpm_deploy.sh
 
 .PHONY: edpm_deploy
 edpm_deploy: input edpm_deploy_prep ## installs the dataplane instance using kustomize. Runs prep step in advance. Set OPENSTACK_REPO and OPENSTACK_BRANCH to deploy from a custom repo.

scripts/cleanup-edpm_deploy.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -ex
+
+# Remove all the networking agent entries in case we do another EDPM deploy
+AGENTS=$(oc rsh openstackclient bash -c 'openstack network agent list | grep -E "edpm-compute-.+\.ctlplane" | cut -d" " -f2 | xargs echo -n')
+if [[ -n "${AGENTS}" ]]; then
+    oc rsh openstackclient bash -c "openstack network agent delete ${AGENTS}"
+fi