summaryrefslogtreecommitdiffstats
path: root/overcloud.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-27 19:50:14 +0000
committerGerrit Code Review <review@openstack.org>2016-05-27 19:50:14 +0000
commitda00da8450861337c6877db630d0dbf78806ba10 (patch)
tree4b2e9f43bfd8f87285d3644d1b94419ccd72a574 /overcloud.yaml
parent083ec30c8c0838f60d2398d464fa8409ddb329ed (diff)
parentf4e5895dd87726a558ac3dbbad08fe447ddb8078 (diff)
Merge "Configure ComputeServices via resource chains"
Diffstat (limited to 'overcloud.yaml')
-rw-r--r--overcloud.yaml17
1 files changed, 17 insertions, 0 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 6a8081af..d56fb6ec 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -661,6 +661,13 @@ parameters:
for each service that should get installed on the Controllers.
type: comma_delimited_list
+ ComputeServices:
+ default: []
+ description: A list of service resources (configured in the Heat
+ resource_registry) which represent nested stacks
+ for each service that should get installed on the Compute Nodes.
+ type: comma_delimited_list
+
# Block storage specific parameters
BlockStorageCount:
type: number
@@ -992,6 +999,13 @@ resources:
SchedulerHints: {get_param: ControllerSchedulerHints}
ServiceConfigSettings: {get_attr: [ControllerServiceChain, config_settings]}
+ ComputeServiceChain:
+ type: OS::TripleO::Services
+ properties:
+ Services: {get_param: ComputeServices}
+ EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
+ MysqlVirtualIPUri: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
+
Compute:
type: OS::Heat::ResourceGroup
depends_on: Networks
@@ -1072,6 +1086,8 @@ resources:
ServerMetadata: {get_param: ServerMetadata}
SchedulerHints: {get_param: NovaComputeSchedulerHints}
NodeIndex: '%index%'
+ ServiceConfigSettings: {get_attr: [ComputeServiceChain, config_settings]}
+
BlockStorage:
type: OS::Heat::ResourceGroup
@@ -1557,6 +1573,7 @@ resources:
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
compute_config: {get_attr: [Compute, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
+ StepConfig: {get_attr: [ComputeServiceChain, step_config]}
ObjectStorageNodesPostDeployment:
type: OS::TripleO::ObjectStoragePostDeployment