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 /overcloud-without-mergepy.yaml | |
| parent | 3b5b48cfd473cc3ab41bf6802ed1a95c5734c233 (diff) | |
| parent | ffe8386e49565ff7005ddd45c4c9ee5ca1019a0a (diff) | |
Merge "Wire in hieradata overrides via ExtraConfig for ObjectStorage"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
| -rw-r--r-- | overcloud-without-mergepy.yaml | 9 |
1 files changed, 9 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 |