summaryrefslogtreecommitdiffstats
path: root/puppet/compute.yaml
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2016-05-23 13:46:23 +0200
committerCarlos Camacho <ccamacho@redhat.com>2016-05-27 17:50:59 +0200
commitf4e5895dd87726a558ac3dbbad08fe447ddb8078 (patch)
tree3edfe112a5ff9ed1224a5c31d6e37b63be5e65d6 /puppet/compute.yaml
parent9036e73afebd8742a90827bb7e5f6d74e4421677 (diff)
Configure ComputeServices via resource chains
This patch wires a Heat feature to configure services via a Heat resource chain. Additional patches will be able to configure compute services using composable services. Change-Id: Ib4fd8bffde51902aa19f9673a389600fc467fc45
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r--puppet/compute.yaml6
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: