diff options
| author |   Steven Hardy <shardy@redhat.com> | 2015-07-16 17:45:32 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2015-07-16 17:55:48 +0100 |
| commit | ffe8386e49565ff7005ddd45c4c9ee5ca1019a0a (patch) | |
| tree | d6e0ad8ab47062517966d592785d5f556139d839 /puppet | |
| parent | 08f72b29472f6c1ba65d5508ffd3391b452a54a1 (diff) | |
Wire in hieradata overrides via ExtraConfig for ObjectStorage
Adds support for global (ExtraConfig) and role-specific
(ObjectStorageExtraConfig) hiera overrides, similar to those added
for the Controller, NovaCompute and BlockStorage roles.
Change-Id: I7dd0d8003017e2738366983cb5d8e08b3f3fa334
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/swift-storage-puppet.yaml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index fb1756b8..05664053 100644 --- a/puppet/swift-storage-puppet.yaml +++ b/puppet/swift-storage-puppet.yaml @@ -65,6 +65,18 @@ parameters: Hostname: type: string default: '' # Defaults to Heat created hostname + ExtraConfig: + default: {} + description: | + Additional hiera configuration to inject into the cluster. Note + that ObjectStorageExtraConfig takes precedence over ExtraConfig. + type: json + ObjectStorageExtraConfig: + default: {} + description: | + Role specific additional hiera configuration to inject into the cluster. + type: json + resources: @@ -126,6 +138,8 @@ resources: hiera: hierarchy: - heat_config_%{::deploy_config_name} + - object_extraconfig + - extraconfig - object - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig - all_nodes # provided by allNodesConfig @@ -134,6 +148,10 @@ resources: datafiles: common: raw_data: {get_file: hieradata/common.yaml} + object_extraconfig: + mapped_data: {get_param: ObjectStorageExtraConfig} + extraconfig: + mapped_data: {get_param: ExtraConfig} object: raw_data: {get_file: hieradata/object.yaml} mapped_data: # data supplied directly to this deployment configuration, etc |