X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=ad93ff037bcfe205f6593781ce757e147bdfc3a0;hb=ca4c32c086ae0584820a5833d826855e40814b53;hp=3f3885946b71f35de3e4609ca3adb0c4433c1727;hpb=688a489021b0ca53c0aebfc7e843ddef5a922f6f;p=apex-tripleo-heat-templates.git diff --git a/Makefile b/Makefile index 3f388594..ad93ff03 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml quantum.yaml mysql.yaml rabbitmq.yaml +NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml neutron.yaml mysql.yaml rabbitmq.yaml 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 $@