Drop deprecated templates/Makefile/merge.py
authorDan Prince <dprince@redhat.com>
Wed, 25 Nov 2015 16:17:14 +0000 (11:17 -0500)
committerDan Prince <dprince@redhat.com>
Wed, 25 Nov 2015 20:00:13 +0000 (15:00 -0500)
commitfba215a69da02a97f5132671c43a2cc6a5a2c2d1
tree803b080b24dcda5d9d73912866f7c3b67b6031b8
parent80d929c75f979d99d4e608aae790f38786b4e055
Drop deprecated templates/Makefile/merge.py

This patch drops a bunch of deprecated stuff from
tripleo-heat-templates. Once we remove the Makefile
(which creates overcloud.yaml) we can proceed
in renaming overcloud-without-mergepy.yaml to
overcloud.yaml.

Change-Id: Ic6ab3777d19e207cae29dcbc2e3839815cd80181
24 files changed:
Makefile [deleted file]
README.rst
deprecated/block-storage.yaml [deleted file]
deprecated/nfs-source.yaml [deleted file]
deprecated/nova-compute-config.yaml [deleted file]
deprecated/nova-compute-instance.yaml [deleted file]
deprecated/overcloud-source.yaml [deleted file]
deprecated/overcloud-vlan-port.yaml [deleted file]
deprecated/ssl-source.yaml [deleted file]
deprecated/swift-deploy.yaml [deleted file]
deprecated/swift-source.yaml [deleted file]
deprecated/swift-storage-source.yaml [deleted file]
deprecated/undercloud-bm-nova-config.yaml [deleted file]
deprecated/undercloud-bm-nova-deploy.yaml [deleted file]
deprecated/undercloud-source.yaml [deleted file]
deprecated/undercloud-vlan-port.yaml [deleted file]
deprecated/undercloud-vm-ironic-config.yaml [deleted file]
deprecated/undercloud-vm-ironic-deploy.yaml [deleted file]
deprecated/undercloud-vm-nova-config.yaml [deleted file]
deprecated/undercloud-vm-nova-deploy.yaml [deleted file]
setup.cfg
test_merge.bash [deleted file]
tripleo_heat_merge/__init__.py [deleted file]
tripleo_heat_merge/merge.py [deleted file]