Code Review / apex-tripleo-heat-templates.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 5e23ab2) | patch
Use merge.py for the undercloud templates.
authorDan Prince <dprince@redhat.com>
Fri, 22 Nov 2013 17:49:42 +0000 (12:49 -0500)
committerDan Prince <dprince@redhat.com>
Mon, 25 Nov 2013 14:14:07 +0000 (09:14 -0500)
commite6afddb3ca4f100ad29fc7a9c30f43e6e5abdc22
tree086b94d21c280e4e8252035321fb2d74316183c3tree | snapshot
parent5e23ab27f0d2530aa2fde0ece84c5eb4ec81b11ccommit | 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
.gitignore diff | blob | history
Makefile diff | blob | history
undercloud-bm-source.yaml [new file with mode: 0644] blob
undercloud-source.yaml [moved from undercloud-bm.yaml with 85% similarity] diff | blob | history
undercloud-vm-source.yaml [new file with mode: 0644] blob
undercloud-vm.yaml [deleted file] blob | history