diff options
author | Dan Prince <dprince@redhat.com> | 2016-03-15 10:49:30 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-03-31 16:09:17 -0400 |
commit | 0bcf693a73609e56f9c077bf70e6b97367ead716 (patch) | |
tree | 94704ff068f78c7b49090173d7259a594fea193b /puppet/controller.yaml | |
parent | 98f19c17a6a562cfcfed2dc9edc7391933492bc9 (diff) |
Configure ControllerServices via resource chains
This patch wires in a new for Mitaka Heat feature
that allows us to dynamically include a set of nested
stacks representing individual services via a Heat resource chain.
Follow on patches will use this interface to decompose the controller
role into isolated services.
Co-Authored-By: Steve Hardy <shardy@redhat.com>
Depends-On: If510abe260ea7852dfe2d1f7f92b529979483068
Change-Id: I84c97a76159704c2d6c963bc4b26e365764b1366
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: |