diff options
| author |   Steven Hardy <shardy@redhat.com> | 2015-07-16 17:40:34 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2015-07-16 17:55:48 +0100 |
| commit | 08f72b29472f6c1ba65d5508ffd3391b452a54a1 (patch) | |
| tree | 1730c701f87435e4c91b92983c609bb2c0169ef1 /overcloud-without-mergepy.yaml | |
| parent | 1f13f59726d7212fdb797f58ab5c70ab7f9cbcaa (diff) | |
Wire in hieradata overrides via ExtraConfig for BlockStorage
Adds support for global (ExtraConfig) and role-specific
(BlockStorageExtraConfig) hiera overrides, similar to those added
for the Controller and NovaCompute roles.
Change-Id: Iaf9665b53407e6a657f56d6516469f2c88bafbdd
Diffstat (limited to 'overcloud-without-mergepy.yaml')
| -rw-r--r-- | overcloud-without-mergepy.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index d4dd5a1f..f341672a 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -562,6 +562,12 @@ parameters: type: string constraints: - custom_constraint: nova.flavor + BlockStorageExtraConfig: + default: {} + description: | + BlockStorage specific configuration to inject into the cluster. Same + structure as ExtraConfig. + type: json # Object storage specific parameters ObjectStorageCount: @@ -881,6 +887,8 @@ resources: '%stackname%': {get_param: 'OS::stack_name'} ServiceNetMap: {get_param: ServiceNetMap} MysqlVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]} + ExtraConfig: {get_param: ExtraConfig} + BlockStorageExtraConfig: {get_param: BlockStorageExtraConfig} ObjectStorage: type: OS::Heat::ResourceGroup |