summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-22 11:42:04 +0000
committerGerrit Code Review <review@openstack.org>2015-07-22 11:42:04 +0000
commitb6f59821604d7fc5a34875a611f3e550e92d3069 (patch)
treeb962a1879bc17a64362a45340f9663a26e479e8c
parent9e6d86c02b2646c2cdbdce44dff726de24fb18ac (diff)
parent1f13f59726d7212fdb797f58ab5c70ab7f9cbcaa (diff)
Merge "Wire in hieradata overrides via ExtraConfig for NovaCompute"
-rw-r--r--puppet/compute-puppet.yaml42
1 files changed, 8 insertions, 34 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index 45c845a8..c0d0e98f 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -32,40 +32,8 @@ 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 hiera configuration to inject into the cluster. Note
+ that NovaComputeExtraConfig takes precedence over ExtraConfig.
type: json
Flavor:
description: Flavor for the nova compute node
@@ -340,6 +308,8 @@ resources:
hiera:
hierarchy:
- heat_config_%{::deploy_config_name}
+ - compute_extraconfig
+ - extraconfig
- compute
- ceph_cluster # provided by CephClusterConfig
- ceph
@@ -347,6 +317,10 @@ resources:
- '"%{::osfamily}"'
- common
datafiles:
+ compute_extraconfig:
+ mapped_data: {get_param: NovaComputeExtraConfig}
+ extraconfig:
+ mapped_data: {get_param: ExtraConfig}
common:
raw_data: {get_file: hieradata/common.yaml}
ceph: