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 /.gitignore | |
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 '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,5 +1,9 @@ # Built via Makefile overcloud.yaml +undercloud-bm.yaml +undercloud-vm.yaml +undercloud-vm-tuskar.yaml +undercloud-vm-ironic.yaml *.py[cod] |