Merge pull request #1371 from deis/makefile-status-fix

fix(Makefile): ignore status of data services in `make start`

Author: mboersma

Makefile

@@ -85,32 +85,32 @@ start: check-fleet start-warning start-routers
 	@# registry logger cache database
 	$(call echo_yellow,"Waiting for deis-registry to start...")
 	$(FLEETCTL) start -no-block $(START_UNITS)
-	@until $(FLEETCTL) list-units | egrep -q "deis-registry.+(running|failed)"; \
+	@until $(FLEETCTL) list-units | egrep -q "deis-registry\..+(running|failed)"; \
 		do sleep 2; \
 			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
-			grep "deis-registry" | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
+			grep "deis-registry\." | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
 			sleep 8; \
 		done
 	$(call check_for_errors)
 
 	@# controller
 	$(call echo_yellow,"Waiting for deis-controller to start...")
 	$(FLEETCTL) start -no-block controller/systemd/*
-	@until $(FLEETCTL) list-units | egrep -q "deis-controller.+(running|failed)"; \
+	@until $(FLEETCTL) list-units | egrep -q "deis-controller\..+(running|failed)"; \
 		do sleep 2; \
 			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
-			grep "deis-controller" | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
+			grep "deis-controller\." | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
 			sleep 8; \
 		done
 	$(call check_for_errors)
 
 	@# builder
 	$(call echo_yellow,"Waiting for deis-builder to start...")
 	$(FLEETCTL) start -no-block builder/systemd/*.service
-	@until $(FLEETCTL) list-units | egrep -q "deis-builder.+(running|failed)"; \
+	@until $(FLEETCTL) list-units | egrep -q "deis-builder\..+(running|failed)"; \
 		do sleep 2; \
 			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
-			grep "deis-builder" | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
+			grep "deis-builder\." | awk '{printf "%-10s (%s)    \r", $$4, $$5}'; \
 			sleep 8; \
 		done
 	$(call check_for_errors)