commit ee2a1a59ec8fa24322c4264b06dcae22a5f047c2
author Andy Bavier <andy@onlab.us> Fri Jan 26 14:37:29 2018 -0800
committer Andy Bavier <andy@opennetworking.org> Tue Jan 30 22:48:55 2018 +0000
tree 8d41275fc66558a63ef0f6e77f83b79d3102282e
parent c207916a60153063575ab4b9b081e3811615eb04

Fix local-xos-teardown with dynamic services

Change-Id: I970d6dabc74db617d3a73c16b74a2fa61cb8d60f

Makefile

diff --git a/Makefile b/Makefile
index 2f49d2f..bc5cc65 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,8 @@
 	$(ANSIBLE_PB) $(PI)/bootstrap-dev-env.yml $(LOGCMD)
 
 local-xos-teardown: xos-update-images
-	cd $(CONFIG_CORD_PROFILE_DIR); docker-compose -p $(PROFILE) rm -s -f || true
+	$(eval COMPOSE_FILE := $(shell cd $(CONFIG_CORD_PROFILE_DIR); ls dynamic_load/* 2>/dev/null | tr '\n' ':')docker-compose.yml)
+	cd $(CONFIG_CORD_PROFILE_DIR); COMPOSE_FILE=$(COMPOSE_FILE) docker-compose -p $(PROFILE) rm -s -f || true
 	rm -f $(M)/local-onboard-profile
 
 # ===== usage: make xos-service-config NAME=exampleservice PATH=exampleservice KEYPAIR=exampleservice_rsa =======