Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add an example of Type: FileInclude.
[apex-tripleo-heat-templates.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
c03abea
..
7b707a1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,4
+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)
notcompute.yaml: $(NOTCOMPUTE)
- python merge.py $(NOTCOMPUTE) > notcompute.yaml
+ 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
+ mv $@.tmp $@