From 3f108ff4bd6a353329f5824bb478c4cb4cbb62d5 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 12 Feb 2015 21:09:02 -0500 Subject: Split out SwiftDevicesAndProxy SoftwareConfig This patch splits out the SwiftDevicesAndProxy config such that alternate implementation (puppet for example) can implement their own SoftwareConfig's via a nested stack. This is controlled by the standard overcloud heat environment. For os-apply-config deployments the implementation should work the same as before. For puppet deployments the implementation uses hiera metadata to configure swift devices. Partial-bug: 1418805 Change-Id: Ibf6038460f36279ad51a04947589d4a03a553f66 --- puppet/swift-devices-and-proxy-config.yaml | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 puppet/swift-devices-and-proxy-config.yaml (limited to 'puppet/swift-devices-and-proxy-config.yaml') diff --git a/puppet/swift-devices-and-proxy-config.yaml b/puppet/swift-devices-and-proxy-config.yaml new file mode 100644 index 00000000..1cb897ee --- /dev/null +++ b/puppet/swift-devices-and-proxy-config.yaml @@ -0,0 +1,38 @@ +heat_template_version: 2014-10-16 +description: 'Swift Devices and Proxy Config for Puppet' + +parameters: + controller_swift_devices: + type: comma_delimited_list + object_store_swift_devices: + type: comma_delimited_list + # TODO: add support for puppet swift proxy memcache configuration + controller_swift_proxy_memcaches: + type: comma_delimited_list + +resources: + + SwiftDevicesAndProxyConfigImpl: + type: OS::Heat::StructuredConfig + properties: + group: os-apply-config + config: + hiera: + datafiles: + swift_devices_and_proxy: + mapped_data: + tripleo::ringbuilder::devices: + list_join: + - ", " + - - list_join: + - ", " + - {get_param: controller_swift_devices} + - list_join: + - ", " + - {get_param: object_store_swift_devices} + +outputs: + config_id: + description: The ID of the SwiftDevicesAndProxyConfigImpl resource. + value: + {get_resource: SwiftDevicesAndProxyConfigImpl} -- cgit 1.2.3-korg