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, 44 deletions

diff --git a/deprecated/undercloud-vm-ironic-deploy.yaml b/deprecated/undercloud-vm-ironic-deploy.yaml
deleted file mode 100644
index 5d23495c..00000000
--- a/deprecated/undercloud-vm-ironic-deploy.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-parameters:
-  IronicPassword:
-    type: string
-    description: Ironic password for keystone access
-    hidden: true
-  NeutronPublicInterface:
-    default: nic1
-    description: What interface to bridge onto br-ex for network nodes.
-    type: string
-  NovaComputeDriver:
-    default: nova.virt.ironic.driver.IronicDriver
-    description: Full class name for the Nova compute driver
-    type: string
-  NovaComputeManager:
-    default: ironic.nova.compute.manager.ClusteredComputeManager
-    description: Full class name for the Nova compute manager
-    type: string
-  NovaSchedulerHostManager:
-    default: nova.scheduler.ironic_host_manager.IronicHostManager
-    description: Full class name for the Nova scheduler host manager
-    type: string
-  PowerSSHPrivateKey:
-    description: Private key for using to ssh to a virtual power host.
-    type: string
-    hidden: true
-resources:
-  undercloudNovaDeployment:
-    depends_on: [undercloudIronicDeployment]
-    type: OS::Heat::StructuredDeployment
-    properties:
-      config: {get_resource: undercloudNovaConfig}
-      server: {get_resource: undercloud}
-      signal_transport: NO_SIGNAL
-      input_values:
-        nova_service_password: {get_param: NovaPassword}
-  undercloudIronicDeployment:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      config: {get_resource: undercloudIronicConfig}
-      server: {get_resource: undercloud}
-      signal_transport: NO_SIGNAL
-      input_values:
-        ironic_service_password: {get_param: IronicPassword}
-        virtual_power_ssh_key: {get_param: PowerSSHPrivateKey}