diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-02-12 21:09:02 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-02-12 22:19:24 -0500 |
| commit | 3f108ff4bd6a353329f5824bb478c4cb4cbb62d5 (patch) | |
| tree | cc6afa1020d7ee74774d470a93c9ca74f51652f6 /puppet | |
| parent | d25bd1f12e6b6b74aac4fdc593492ec42518bf8d (diff) | |
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
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller-puppet.yaml | 3 | ||||
| -rw-r--r-- | puppet/swift-devices-and-proxy-config.yaml | 38 |
2 files changed, 39 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 537b1cf9..845b6b63 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -554,6 +554,7 @@ resources: - heat_config_%{::deploy_config_name} - controller - object + - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig - common datafiles: common: @@ -564,8 +565,6 @@ resources: raw_data: {get_file: hieradata/controller.yaml} oac_data: # data we map in from other OAC configurations bootstrap_nodeid: bootstrap_host.bootstrap_nodeid - # Swift - tripleo::ringbuilder::devices: swift.devices mapped_data: # data supplied directly to this deployment configuration, etc debug: {get_input: debug} bootstack_nodeid: {get_input: bootstack_nodeid} 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} |