diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-23 13:51:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-23 13:51:22 +0000 |
| commit | f441b8ad6f43d6dc29fa9a327a0062684068fab2 (patch) | |
| tree | 5549472191a6be9273e2e6356df122f4d791ff54 /puppet | |
| parent | 3b5b48cfd473cc3ab41bf6802ed1a95c5734c233 (diff) | |
| parent | ffe8386e49565ff7005ddd45c4c9ee5ca1019a0a (diff) | |
Merge "Wire in hieradata overrides via ExtraConfig for ObjectStorage"
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 dc6ff899..b3579429 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 |