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 7b707a1..ad93ff0 100644 (file)
--- 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 $@