From 49b552a44b2c31779dd39b144802fae9d1de7579 Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Tue, 20 Feb 2018 16:54:10 +0000
Subject: [PATCH] Makefile: sync with openstack-helm

Change-Id: Ifd626356132cac8e7a3646b286f60fca833e8a38
---
 Makefile | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index aa86e6f3..69eba463 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# It's necessary to set this because some environments don't link sh -> bash.
+SHELL := /bin/bash
+
 HELM := helm
 TASK := build
 
-EXCLUDES := helm-toolkit doc tests tools logs
+EXCLUDES := helm-toolkit doc tests tools logs tmp
 CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
 
+.PHONY: $(EXCLUDES) $(CHARTS)
+
 all: $(CHARTS)
 
 $(CHARTS):
@@ -37,8 +42,21 @@ build-%: lint-%
 
 clean:
 	@echo "Removed .b64, _partials.tpl, and _globals.tpl files"
-	rm -rf helm-toolkit/secrets/*.b64
-	rm -rf */templates/_partials.tpl
-	rm -rf */templates/_globals.tpl
+	rm -f helm-toolkit/secrets/*.b64
+	rm -f */templates/_partials.tpl
+	rm -f */templates/_globals.tpl
+	rm -f *tgz */charts/*tgz
+	rm -f */requirements.lock
+	-rm -rf */charts */tmpcharts
 
-.PHONY: $(EXCLUDES) $(CHARTS)
+pull-all-images:
+	@./tools/pull-images.sh
+
+pull-images:
+	@./tools/pull-images.sh $(filter-out $@,$(MAKECMDGOALS))
+
+dev-deploy:
+	@./tools/gate/devel/start.sh $(filter-out $@,$(MAKECMDGOALS))
+
+%:
+	@: