From: Robert Collins <rbtcollins@hp.com>
Date: Mon, 3 Feb 2014 23:59:54 +0000 (+1300)
Subject: Make make overcloud.yaml DTRT always.
X-Git-Tag: opnfv-6.0.0~2885
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1fbf8ac0dc7469b3c8fff538ecf9e883e83332a6;p=apex-tripleo-heat-templates.git

Make make overcloud.yaml DTRT always.

Change-Id: I3aebf49c87434026b9eea9de9a67cb3196bc48b2
---

diff --git a/Makefile b/Makefile
index 2c9c2c0e..dda8f2c4 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,6 @@ overcloud_source_deps = nova-compute-instance.yaml
 
 all: $(generated_templates)
 
-# Note that COMPUTESCALE is not a physical dep - 'make overcloud.yaml' won't do
-# the right thing if you change COMPUTESCALE from one run to another.
 overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps)
 	python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} overcloud-source.yaml swift-source.yaml ssl-source.yaml > $@.tmp
 	mv $@.tmp $@
@@ -43,3 +41,5 @@ test:
 
 clean:
 	rm -f $(generated_templates)
+
+.PHONY: clean overcloud.yaml