diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-02-04 12:59:54 +1300 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-02-04 12:59:54 +1300 |
| commit | 1fbf8ac0dc7469b3c8fff538ecf9e883e83332a6 (patch) | |
| tree | 40db30d4d86dd6f8b07a503422f6c893edaba741 | |
| parent | b047f27493ad6403745bd61a2f25eba0c4405a0f (diff) | |
Make make overcloud.yaml DTRT always.
Change-Id: I3aebf49c87434026b9eea9de9a67cb3196bc48b2
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |