Rename overcloud-without-mergepy to overcloud.

Mergepy is gone. We can now rename our primary overcloud
template to be more sensible.

Change-Id: I14f5ff78b083b34590d30357df94c42ff6a0c2c0
This commit is contained in:
Dan Prince 2015-11-25 11:19:40 -05:00
parent fef3071774
commit 3ec35a3f2f
3 changed files with 1499 additions and 1507 deletions

9
.gitignore vendored
View File

@ -1,12 +1,3 @@
# Built via Makefile
overcloud.yaml
overcloud-with-block-storage.yaml
overcloud-with-block-storage-nfs.yaml
undercloud-bm.yaml
undercloud-vm.yaml
undercloud-vm-ironic.yaml
undercloud-vm-ironic-vlan.yaml
*.py[cod]
# C extensions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1 @@
overcloud.yaml

1498
overcloud.yaml Normal file

File diff suppressed because it is too large Load Diff