openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Rename overcloud-without-mergepy to overcloud. 

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

Change-Id: I14f5ff78b083b34590d30357df94c42ff6a0c2c0
( cherry picked from commit 3ec35a3f2f)
Conflicts:
	overcloud-without-mergepy.yaml
This commit is contained in:
Dan Prince 2015-11-25 11:19:40 -05:00 committed by marios
parent d801de7b5d
commit 01079a9475
3 changed files with 1499 additions and 1507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

1498
overcloud-without-mergepy.yaml
View File

File diff suppressed because it is too large Load Diff

1
overcloud-without-mergepy.yaml Symbolic link
View File

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

1498
overcloud.yaml Normal file
View File

File diff suppressed because it is too large Load Diff