Vagrant fixes (#125)

* Fix destroy before bootkube clone * Fix multiple calls of vagrant-destroy.sh
cloudnativelabs · Aug 13, 2017 · ef8cf33 · ef8cf33
1 parent 82818d8
commit ef8cf33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,6 @@ vagrant: ## Run vagrant against a previously up'd cluster. Example: make vagrant
 
 vagrant-destroy: ## Destroy a previously created local VM cluster
 	@hack/vagrant-destroy.sh
-	@HACK_MULTI_NODE="true" hack/vagrant-destroy.sh
 
 vagrant-clean: vagrant-destroy ## Destroy a previously created local VM cluster and remove all downloaded/generated assets
 	@rm -rf hack/_output

diff --git a/hack/vagrant-destroy.sh b/hack/vagrant-destroy.sh
@@ -8,6 +8,11 @@ export HACK_DIR
 # shellcheck source=vagrant-common.sh
 . "${HACK_DIR}/vagrant-common.sh"
 
+if [ ! -d "${BK_CLONE_DIR}" ]; then
+  echo "INFO: Bootkube repo not found. Nothing to destroy."
+  exit 0
+fi
+
 for i in "${BK_CLONE_DIR}/hack/single-node" "${BK_CLONE_DIR}/hack/multi-node"; do
   echo "INFO: Running vagrant destroy -f in ${i}"
   cd "${i}"