diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-27 19:50:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-27 19:50:14 +0000 |
| commit | da00da8450861337c6877db630d0dbf78806ba10 (patch) | |
| tree | 4b2e9f43bfd8f87285d3644d1b94419ccd72a574 /puppet/compute.yaml | |
| parent | 083ec30c8c0838f60d2398d464fa8409ddb329ed (diff) | |
| parent | f4e5895dd87726a558ac3dbbad08fe447ddb8078 (diff) | |
Merge "Configure ComputeServices via resource chains"
Diffstat (limited to 'puppet/compute.yaml')
| -rw-r--r-- | puppet/compute.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index e56deefd..ee00a890 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -339,6 +339,9 @@ parameters: type: json description: Optional scheduler hints to pass to nova default: {} + ServiceConfigSettings: + type: json + default: {} resources: @@ -481,6 +484,7 @@ resources: - heat_config_%{::deploy_config_name} - compute_extraconfig - extraconfig + - service_configs - compute - ceph_cluster # provided by CephClusterConfig - ceph @@ -495,6 +499,8 @@ resources: - neutron_opencontrail_data # Optionally provided by ComputeExtraConfigPre merge_behavior: deeper datafiles: + service_configs: + mapped_data: {get_param: ServiceConfigSettings} compute_extraconfig: mapped_data: {get_param: NovaComputeExtraConfig} extraconfig: |