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

1 files changed, 0 insertions, 23 deletions

diff --git a/deprecated/undercloud-bm-nova-config.yaml b/deprecated/undercloud-bm-nova-config.yaml
deleted file mode 100644
index 306dc0a1..00000000
--- a/deprecated/undercloud-bm-nova-config.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resources:
-  undercloudNovaConfig:
-    type: OS::Heat::StructuredConfig
-    properties:
-      config:
-        nova:
-          compute_hostname: undercloud
-          compute_driver: {get_param: NovaComputeDriver}
-          compute_manager: {get_param: NovaComputeManager}
-          scheduler_host_manager: {get_param: NovaSchedulerHostManager}
-          db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova']]}
-          default_ephemeral_format: ext4
-          host: 127.0.0.1
-          metadata-proxy: false
-          tuning:
-            ram_allocation_ratio: 1.0
-            reserved_host_memory_mb: 0
-          baremetal:
-            arch: {get_input: nova_arch}
-            db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova_bm']]}
-            power_manager: {get_input: power_manager}
-            pxe_deploy_timeout: {get_input: pxe_deploy_timeout}
-          service-password: {get_input: nova_service_password}