diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-04-03 15:33:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-04-03 15:33:07 +0000 |
| commit | 44bad1dd2489d92cd360ffcc4b79d8a5fe94aa2b (patch) | |
| tree | d0403892719f578cab2df304a1429f2f5458ebea /puppet/controller.yaml | |
| parent | 59bbf36092330f36f9de9cf2b6e39943a90a6f06 (diff) | |
| parent | 0bcf693a73609e56f9c077bf70e6b97367ead716 (diff) | |
Merge "Configure ControllerServices via resource chains"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index efdf08bb..d966700f 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -790,6 +790,9 @@ parameters: type: json description: Optional scheduler hints to pass to nova default: {} + ServiceConfigSettings: + type: json + default: {} resources: @@ -1294,6 +1297,7 @@ resources: - heat_config_%{::deploy_config_name} - controller_extraconfig - extraconfig + - service_configs - controller - database - object @@ -1316,6 +1320,8 @@ resources: - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre - neutron_plumgrid_data # Optionally provided by ControllerExtraConfigPre datafiles: + service_configs: + mapped_data: {get_param: ServiceConfigSettings} controller_extraconfig: mapped_data: {get_param: ControllerExtraConfig} extraconfig: |