diff options
| author |   Dan Prince <dprince@redhat.com> | 2013-11-22 12:49:42 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2013-11-25 09:14:07 -0500 |
| commit | e6afddb3ca4f100ad29fc7a9c30f43e6e5abdc22 (patch) | |
| tree | 086b94d21c280e4e8252035321fb2d74316183c3 /Makefile | |
| parent | 5e23ab27f0d2530aa2fde0ece84c5eb4ec81b11c (diff) | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -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 $@ |