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

diff --git a/deprecated/undercloud-vm-nova-deploy.yaml b/deprecated/undercloud-vm-nova-deploy.yaml
deleted file mode 100644
index da15b46d..00000000
--- a/deprecated/undercloud-vm-nova-deploy.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-parameters:
-  NeutronPublicInterface:
-    default: nic1
-    description: What interface to bridge onto br-ex for network nodes.
-    type: string
-  NovaComputeDriver:
-    default: baremetal.driver.BareMetalDriver
-    description: Full class name for the Nova compute driver
-    type: string
-  NovaComputeManager:
-    default: nova.compute.manager.ComputeManager
-    description: Full class name for the Nova compute manager
-    type: string
-  NovaSchedulerHostManager:
-    default: nova.scheduler.host_manager.HostManager
-    description: Full class name for the Nova scheduler host manager
-    type: string
-  PowerManager:
-    default: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
-    description: Bare metal power manager driver.
-    type: string
-  PowerSSHHost:
-    default: 192.168.122.1
-    description: SSH host to ssh to for power management operations.
-    type: string
-  PowerSSHPrivateKey:
-    description: Private key for using to ssh to a virtual power host.
-    type: string
-    hidden: true
-  PowerUserName:
-    default: stack
-    description: What username to ssh to the virtual power host with.
-    type: string
-  PxeDeployTimeout:
-    default: 2400
-    description: Timeout for PXE deployment of baremetal nodes
-    type: number
-resources:
-  undercloudNovaDeployment:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      config: {get_resource: undercloudNovaConfig}
-      server: {get_resource: undercloud}
-      signal_transport: NO_SIGNAL
-      input_values:
-        nova_arch: {get_param: BaremetalArch}
-        power_manager: {get_param: PowerManager}
-        pxe_deploy_timeout: {get_param: PxeDeployTimeout}
-        nova_service_password: {get_param: NovaPassword}
-        user: {get_param: PowerUserName}
-        ssh_host: {get_param: PowerSSHHost}
-        ssh_key: {get_param: PowerSSHPrivateKey}