diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-17 08:35:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-17 08:35:58 +0000 |
commit | 89095fea26164d96bd14f2f86cc8cd7d3b4c85e6 (patch) | |
tree | ed222c132eb1bf643580d88efc7a7877c77f1c17 /overcloud-without-mergepy.yaml | |
parent | b9a1f31df3d4a33b1d317ad0f970b88adff17f5a (diff) | |
parent | 71e9426f195cf3c17fc11adf17f14d41caa7cf30 (diff) |
Merge "Enable hieradata ExtraConfig overrides for Controller"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 19c65a4e..d4dd5a1f 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -300,40 +300,9 @@ parameters: ExtraConfig: default: {} description: | - Additional configuration to inject into the cluster. The JSON should have - the following structure: - {"FILEKEY": - {"config": - [{"section": "SECTIONNAME", - "values": - [{"option": "OPTIONNAME", - "value": "VALUENAME" - } - ] - } - ] - } - } - For instance: - {"nova": - {"config": - [{"section": "default", - "values": - [{"option": "force_config_drive", - "value": "always" - } - ] - }, - {"section": "cells", - "values": - [{"option": "driver", - "value": "nova.cells.rpc_driver.CellsRPCDriver" - } - ] - } - ] - } - } + Additional configuration to inject into the cluster. The format required + may be implementation specific, e.g puppet hieradata. Any role specific + ExtraConfig, e.g controllerExtraConfig takes precedence over ExtraConfig. type: json FencingConfig: default: {} |