summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2013-11-29 15:12:33 +0200
committermarios <marios@redhat.com>2013-12-17 15:53:08 +0200
commitc9ce27c981d74c18f844fa71339c0177c3f76b28 (patch)
tree79816c9ffb800bcf3fc47ddc7197cff285ddc761 /Makefile
parentf6289d012740c730ac1b9b0ea8a3842f8c72149e (diff)
Make merge.py installable as a package using pbr
Now that merge.py is invokable from another script (Ia6b6416fe10358d23f2b120283eecaf4c1178cfd) and from comments at that review, it makes sense to offer a nicer way to consume the merge functionality. Once you git clone tripleo-heat-templates you can python setup.py install and get /usr/bin/tripleo_heat_merge as well as a tripleo_heat_merge package in python2.7/site-packages. Makefile edits required because we moved merge.py into the tripleo_heat_merge directory for the packaging. Change-Id: I587fa7a826f93f89e8e5c266af7f5765438fe738
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: