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
This commit is contained in:
Clint Byrum
2013-07-09 10:38:03 -07:00
parent 3c12e51a84
commit 6529485a2a
2 changed files with 27 additions and 17 deletions

View File

@@ -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