summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-10-16 01:53:14 +0000
committerGerrit Code Review <review@openstack.org>2013-10-16 01:53:14 +0000
commitb3b5b600511515897f529750439776355c77d564 (patch)
tree99295006c05300df6f22f8206509a7b78aae0828 /Makefile
parentee0a83ec16d464472d0e6580272e6944530f4f9a (diff)
parentd3aa08dd5f3d82d9b4348b0341e63c42876e9c90 (diff)
Merge "Add tuskar API service configuration"
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5684dee9..0d7d3f84 100644
--- a/Makefile
+++ b/Makefile
@@ -2,5 +2,9 @@ overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml
python merge.py $< > $@.tmp
mv $@.tmp $@
+undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml
+ python merge.py $^ > $@.tmp
+ mv $@.tmp $@
+
test:
@bash test_merge.bash