aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-07-10 14:17:06 -0700
committerClint Byrum <clint@fewbar.com>2013-07-10 17:24:53 -0700
commit793dd12964962cda1e939705ea47a1a29f21ca70 (patch)
tree33ccc13f5e4b5b02284e6552e616d4c2c6e2d390
parent7ed33928b2cb67426f4a75ac45416309ee87f6d6 (diff)
Generate overcloud.yaml using overcloud-source.
This new version does not need any nested stacks and correctly references notcompute. Change-Id: I16f846f7983a956b5159d17bef85cf6a87d69b45
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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 $@