aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-07-09 10:38:03 -0700
committerClint Byrum <clint@fewbar.com>2013-07-09 14:17:39 -0700
commit6529485a2af4075742dd23846a5fef68a9e8bd4c (patch)
tree32fd389528315af0b45956c2a0377535112d3384 /Makefile
parent3c12e51a8470b43f50320316f9dd76617e2e8f11 (diff)
Update bootstack-vm to match undercloud.
Also add Makefile stanza to produce overcoud.yaml from bootstack-vm and nova-compute-group. This should allow independent usage of nova-compute-group without having to manually update overcloud. Change-Id: Id2bd20596e6be887b55019fdad31e6b0f4762eb7
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6949b3a8..8e0d18f4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,3 +2,6 @@ NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml quantum.ya
notcompute.yaml: $(NOTCOMPUTE)
python merge.py --master-role notcompute --slave-roles stateless stateful -- $(NOTCOMPUTE) > notcompute.yaml
+
+overcloud.yaml: bootstack-vm.yaml nova-compute-group.yaml
+ python merge.py bootstack-vm.yaml nova-compute-group.yaml > overcloud.yaml