From fba215a69da02a97f5132671c43a2cc6a5a2c2d1 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 25 Nov 2015 11:17:14 -0500
Subject: 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
---
 deprecated/swift-deploy.yaml | 69 --------------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 deprecated/swift-deploy.yaml

(limited to 'deprecated/swift-deploy.yaml')

diff --git a/deprecated/swift-deploy.yaml b/deprecated/swift-deploy.yaml
deleted file mode 100644
index d4d32cbd..00000000
--- a/deprecated/swift-deploy.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-description: 'Swift-proxy: OpenStack object storage proxy'
-parameters:
-  SwiftHashSuffix:
-    default: unset
-    description: A random string to be used as a salt when hashing to determine mappings in the ring.
-    type: string
-    hidden: true
-  SwiftMountCheck:
-    default: 'false'
-    description: Value of mount_check in Swift account/container/object -server.conf
-    type: boolean
-  SwiftMinPartHours:
-    type: number
-    default: 1
-    description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
-  SwiftPartPower:
-    default: 10
-    description: Partition Power to use when building Swift rings
-    type: number
-  SwiftPassword:
-    default: unset
-    description: The password for the swift service account, used by the swift proxy services.
-    type: string
-    hidden: true
-  SwiftReplicas:
-    type: number
-    default: 3
-    description: How many replicas to use in the swift rings.
-resources:
-  controller0Swift:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      config: {get_resource: SwiftConfig}
-      server: {get_resource: controller0}
-      signal_transport: NO_SIGNAL
-      input_values:
-        swift_hash_suffix: {get_param: SwiftHashSuffix}
-        swift_mount_check: {get_param: SwiftMountCheck}
-        swift_password: {get_param: SwiftPassword}
-        swift_part_power: {get_param: SwiftPartPower}
-        swift_devices:
-          Fn::Join:
-          - ', '
-          - Merge::Map:
-              controller0:
-                Fn::Join:
-                - ''
-                - - 'r1z1-'
-                  - {get_attr: [controller0, networks, ctlplane, 0]}
-                  - ':%PORT%/d1'
-              SwiftStorage0:
-                Fn::Join:
-                - ''
-                - - 'r1z1-'
-                  - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
-                  - ':%PORT%/d1'
-        swift_proxy_memcache:
-          Fn::Join:
-            - ','
-            - Merge::Map:
-                controller0:
-                  Fn::Join:
-                    - ', '
-                    - - Fn::Join:
-                        - ''
-                        - - {get_attr: [controller0, networks, ctlplane, 0]}
-                          - ':11211'
-        swift_replicas: { get_param: SwiftReplicas}
-        swift_min_part_hours: { get_param: SwiftMinPartHours}
-- 
cgit 1.2.3-korg