summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorChris Krelle <nobodycam@gmail.com>2013-08-30 11:46:46 -0700
committerChris Krelle <nobodycam@gmail.com>2013-10-23 14:41:58 -0700
commit2fcc443bf2d00dc04d7bab831ea0b55e52a5656a (patch)
tree0cd8e13a8708d5a1c1cebf54c427288519020de0 /Makefile
parentb3b5b600511515897f529750439776355c77d564 (diff)
Add Ironic-source.yaml
Mergeable Ironic yaml template. Makefile updated to create a undercloud-vm-ironic template. This patch will allow Ironic developers to include Ironic in the undercloud vm. Change-Id: Ie3998336a12f3509742634e59de5c9bee922d579
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0d7d3f84..52d65efb 100644
--- a/Makefile
+++ b/Makefile
@@ -6,5 +6,9 @@ undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml
python merge.py $^ > $@.tmp
mv $@.tmp $@
+undercloud-vm-ironic.yaml: undercloud-vm.yaml ironic-source.yaml
+ python merge.py $^ > $@.tmp
+ mv $@.tmp $@
+
test:
@bash test_merge.bash