summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 38e495e5..b05f951a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,23 @@
overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml
# $^ 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 merge.py overcloud-source.yaml swift-source.yaml > $@.tmp
+ 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 merge.py $^ > $@.tmp
+ python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml
- python merge.py $^ > $@.tmp
+ python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml
- python merge.py $^ > $@.tmp
+ python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-source.yaml ironic-source.yaml
- python merge.py $^ > $@.tmp
+ python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
test: