From: Clint Byrum <clint@fewbar.com>
Date: Wed, 10 Jul 2013 21:17:06 +0000 (-0700)
Subject: Generate overcloud.yaml using overcloud-source.
X-Git-Tag: opnfv-6.0.0~2983
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=793dd12964962cda1e939705ea47a1a29f21ca70;p=apex-tripleo-heat-templates.git

Generate overcloud.yaml using overcloud-source.

This new version does not need any nested stacks and correctly
references notcompute.

Change-Id: I16f846f7983a956b5159d17bef85cf6a87d69b45
---

diff --git a/Makefile b/Makefile
index 7b707a17..ad93ff03 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,6 @@ NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml neutron.ya
 notcompute.yaml: $(NOTCOMPUTE)
 	python merge.py --master-role notcompute --slave-roles stateless stateful -- $^ > notcompute.yaml
 
-overcloud.yaml: bootstack-vm.yaml nova-compute-group.yaml
-	python merge.py $^ > $@.tmp
+overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml
+	python merge.py $< > $@.tmp
 	mv $@.tmp $@