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

diff --git a/deprecated/nfs-source.yaml b/deprecated/nfs-source.yaml
deleted file mode 100644
index 5d865ea7..00000000
--- a/deprecated/nfs-source.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-resources:
-  controllerNfsServerConfig:
-    type: OS::Heat::StructuredConfig
-    properties:
-      group: os-apply-config
-      config:
-        nfs_server:
-          shares:
-            - name: cinder
-              clients:
-                - machine: 192.0.2.0/24
-                  options: rw,async,all_squash,anonuid=0,anongid=0
-  controllerCinderNfsConfig:
-    type: OS::Heat::StructuredConfig
-    properties:
-      group: os-apply-config
-      config:
-        cinder:
-          include_nfs_backend: true
-          nfs_shares:
-            Fn::Join:
-              - ':'
-              - - {get_attr: [controller0, networks, ctlplane, 0]}
-                - /mnt/state/var/lib/nfs/cinder
-  controllerNfsServerDeployment:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      config: {get_resource: controllerNfsServerConfig}
-      server: {get_resource: controller0}
-      signal_transport: NO_SIGNAL
-  controller0CinderNfsDeployment:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      config: {get_resource: controllerCinderNfsConfig}
-      server: {get_resource: controller0}
-      signal_transport: NO_SIGNAL