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
Merge "Add signal_transport property"
[apex-tripleo-heat-templates.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
dda8f2c
..
18199ed
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,40
+1,42
@@
-generated_templates = \
- overcloud.yaml \
-
undercloud-vm.yaml
\
- undercloud-
bm.yaml
\
- undercloud-
vm-tuskar.yaml
\
+generated_templates =
\
+ overcloud.yaml
\
+
overcloud-with-block-storage-nfs.yaml
\
+ undercloud-
vm.yaml
\
+ undercloud-
bm.yaml
\
undercloud-vm-ironic.yaml
# Files included in overcloud-source.yaml via FileInclude
overcloud_source_deps = nova-compute-instance.yaml
all: $(generated_templates)
undercloud-vm-ironic.yaml
# Files included in overcloud-source.yaml via FileInclude
overcloud_source_deps = nova-compute-instance.yaml
all: $(generated_templates)
+VALIDATE := $(patsubst %,validate-%,$(generated_templates))
+validate-all: $(VALIDATE)
+$(VALIDATE):
+ heat template-validate -f $(subst validate-,,$@)
-overcloud.yaml: overcloud-source.yaml
swift-source.yaml ssl-source
.yaml $(overcloud_source_deps)
- python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'}
overcloud-source.yaml swift-source.yaml ssl-source
.yaml > $@.tmp
+overcloud.yaml: overcloud-source.yaml
block-storage.yaml swift-deploy.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml nova-compute-config
.yaml $(overcloud_source_deps)
+ python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'}
--scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE='0'} --scale BlockStorage=$${BLOCKSTORAGESCALE='0'} overcloud-source.yaml block-storage.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml swift-deploy.yaml nova-compute-config
.yaml > $@.tmp
mv $@.tmp $@
mv $@.tmp $@
-overcloud-with-block-storage
.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.yaml
+overcloud-with-block-storage
-nfs.yaml: overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml $(overcloud_source_deps)
# $^ won't work here because we want to list nova-compute-instance.yaml as
# a prerequisite but don't want to pass it into merge.py
# $^ won't work here because we want to list nova-compute-instance.yaml as
# a prerequisite but don't want to pass it into merge.py
- python ./tripleo_heat_merge/merge.py
overcloud-source.yaml swift-source.yaml block-storag
e.yaml > $@.tmp
+ python ./tripleo_heat_merge/merge.py
--scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE='0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'1'} overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-sourc
e.yaml > $@.tmp
mv $@.tmp $@
mv $@.tmp $@
-undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-
source
.yaml
+undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-
nova-config.yaml undercloud-vm-nova-deploy
.yaml
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
-undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-
source
.yaml
+undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-
nova-config.yaml undercloud-bm-nova-deploy
.yaml
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
-undercloud-vm-
tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source
.yaml
+undercloud-vm-
ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy
.yaml
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
-undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml ironic-source.yaml
- python ./tripleo_heat_merge/merge.py $^ > $@.tmp
- mv $@.tmp $@
+check: test
test:
@bash test_merge.bash
test:
@bash test_merge.bash
@@
-42,4
+44,4
@@
test:
clean:
rm -f $(generated_templates)
clean:
rm -f $(generated_templates)
-.PHONY: clean overcloud.yaml
+.PHONY: clean overcloud.yaml
check