summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-23 13:51:22 +0000
committerGerrit Code Review <review@openstack.org>2015-07-23 13:51:22 +0000
commitf441b8ad6f43d6dc29fa9a327a0062684068fab2 (patch)
tree5549472191a6be9273e2e6356df122f4d791ff54
parent3b5b48cfd473cc3ab41bf6802ed1a95c5734c233 (diff)
parentffe8386e49565ff7005ddd45c4c9ee5ca1019a0a (diff)
Merge "Wire in hieradata overrides via ExtraConfig for ObjectStorage"
-rw-r--r--overcloud-without-mergepy.yaml9
-rw-r--r--puppet/swift-storage-puppet.yaml18
-rw-r--r--swift-storage.yaml5
3 files changed, 32 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index ab9184fe..53d4beca 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -576,6 +576,13 @@ parameters:
SwiftStorageImage:
default: overcloud-swift-storage
type: string
+ ObjectStorageExtraConfig:
+ default: {}
+ description: |
+ ObjectStorage specific configuration to inject into the cluster. Same
+ structure as ExtraConfig.
+ type: json
+
# Ceph storage specific parameters
CephStorageCount:
@@ -910,6 +917,8 @@ resources:
template: {get_param: ObjectStorageHostnameFormat}
params:
'%stackname%': {get_param: 'OS::stack_name'}
+ ExtraConfig: {get_param: ExtraConfig}
+ ObjectStorageExtraConfig: {get_param: ObjectStorageExtraConfig}
CephStorage:
type: OS::Heat::ResourceGroup
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
diff --git a/swift-storage.yaml b/swift-storage.yaml
index e4cacf3c..1a2967fa 100644
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -39,6 +39,11 @@ parameters:
}
}
type: json
+ ObjectStorageExtraConfig:
+ default: {}
+ description: |
+ Role specific additional configuration to inject into the cluster.
+ type: json
Flavor:
description: Flavor for Swift storage nodes to request when deploying.
type: string