openstack/tripleo-heat-templates
Code Issues Proposed changes

Add Ironic-source.yaml

Browse Source 
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
This commit is contained in:
Chris Krelle
2013-08-30 11:46:46 -07:00
parent b3b5b60051
commit 2fcc443bf2
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -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