summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRoman Podolyaka <rpodolyaka@mirantis.com>2013-10-11 17:52:55 +0300
committerRoman Podolyaka <rpodolyaka@mirantis.com>2013-10-14 18:31:23 +0300
commitd3aa08dd5f3d82d9b4348b0341e63c42876e9c90 (patch)
tree83ce72cff0d0253a5b2be9582d439ad0129220fe /Makefile
parentfcbead3871c995f4da423c9fffe9ed444407a5ce (diff)
Add tuskar API service configuration
Needed for I1d16e535ae50a06a8792e1613bb6b6c4647bf128 to work properly. Change-Id: Ib66e688bd7500f03dea7d4282607cd51078e9a51
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