diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-22 11:43:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-22 11:43:44 +0000 |
| commit | 0efe4c7ebee20db5f232f590c6ebc3d40e546c20 (patch) | |
| tree | 8a734e220733d8e60ed94bccd2ed0a35ab0de277 /overcloud-without-mergepy.yaml | |
| parent | b6f59821604d7fc5a34875a611f3e550e92d3069 (diff) | |
| parent | 08f72b29472f6c1ba65d5508ffd3391b452a54a1 (diff) | |
Merge "Wire in hieradata overrides via ExtraConfig for BlockStorage"
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 5e1470f0..ed0a0975 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 |