From c82b6cec10e1b411774d2f4d5d51565ba7c3550c Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 23 Feb 2015 14:22:12 -0500 Subject: Deprecate the old mergepy overcloud templates This patch moves all the related mergepy templates for the overcloud into a deprecated directory. The Makefile has been updated so that overcloud.yaml is still generated at the top level so this shouldn't break end users. This is to reduce confusion for new users who are learning the TripleO heat templates and find the fact that we have two full implementations very confusing. Change-Id: I0848aca4dee3e37cb4c6089c5f655ad22ac6c5fd --- deprecated/swift-deploy.yaml | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 deprecated/swift-deploy.yaml (limited to 'deprecated/swift-deploy.yaml') diff --git a/deprecated/swift-deploy.yaml b/deprecated/swift-deploy.yaml new file mode 100644 index 00000000..d4d32cbd --- /dev/null +++ b/deprecated/swift-deploy.yaml @@ -0,0 +1,69 @@ +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