![Mark McLoughlin](/assets/img/avatar_default.png)
We include a comment to explain why nova-compute-instance.yaml is included in the prerequisite list for overcloud.yaml, but this comment gets echoed by make before it executes the recipe using a shell. $> make overcloud.yaml # overcloud-source.yaml [..] won't work here because [..] # a prerequisite but don't want to pass it into merge.py python ./tripleo_heat_merge/merge.py overcloud-source.yaml [..] mv overcloud.yaml.tmp overcloud.yaml Instead, maintain a list of files included by overcloud.yaml in a variable and put a comment above that. Change-Id: I1af69fbb33e1833170f086aec9b54c5c4e57138f
26 lines
910 B
Makefile
26 lines
910 B
Makefile
# Files included in overcloud-source.yaml via FileInclude
|
|
overcloud_source_deps = nova-compute-instance.yaml
|
|
|
|
overcloud.yaml: overcloud-source.yaml swift-source.yaml $(overcloud_source_deps)
|
|
python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml > $@.tmp
|
|
mv $@.tmp $@
|
|
|
|
undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml
|
|
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
|
|
mv $@.tmp $@
|
|
|
|
undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml
|
|
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
|
|
mv $@.tmp $@
|
|
|
|
undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml
|
|
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
|
|
mv $@.tmp $@
|
|
|
|
undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-source.yaml ironic-source.yaml
|
|
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
|
|
mv $@.tmp $@
|
|
|
|
test:
|
|
@bash test_merge.bash
|