From e6afddb3ca4f100ad29fc7a9c30f43e6e5abdc22 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Fri, 22 Nov 2013 12:49:42 -0500
Subject: Use merge.py for the undercloud templates.

This will require some changes to our devtest scripts
and TOCI to ensure we build the overcloud-vm template
before attempting to use it.

Change-Id: I14b5e4a0ccf5f18429bfc33e527bdb4760b8d1a3
---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 51e954a7..38e495e5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,19 @@ overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.ya
 	python merge.py overcloud-source.yaml swift-source.yaml > $@.tmp
 	mv $@.tmp $@
 
-undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml
+undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml
 	python merge.py $^ > $@.tmp
 	mv $@.tmp $@
 
-undercloud-vm-ironic.yaml: undercloud-vm.yaml ironic-source.yaml
+undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml
+	python merge.py $^ > $@.tmp
+	mv $@.tmp $@
+
+undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml
+	python merge.py $^ > $@.tmp
+	mv $@.tmp $@
+
+undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-source.yaml ironic-source.yaml
 	python merge.py $^ > $@.tmp
 	mv $@.tmp $@
 
-- 
cgit 1.2.3-korg