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:
parent
d801de7b5d
commit
01079a9475
|
@ -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]
|
*.py[cod]
|
||||||
|
|
||||||
# C extensions
|
# C extensions
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1 @@
|
||||||
|
overcloud.yaml
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue