openstack/tripleo-heat-templates
Code Issues Proposed changes

Use merge.py for the undercloud templates.

Browse Source 
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
This commit is contained in:
Dan Prince
2013-11-22 12:49:42 -05:00
parent 5e23ab27f0
commit e6afddb3ca
6 changed files with 89 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

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