Convert AllNodesExtraConfig to OS::Heat::None
Instead of creating a nested stack, as it's slightly lower overhead and will make things easier when adding custom roles (where a hard-coded default template can't work) Change-Id: If9f8294ba477d1c1364e19a52152905a2c02e959
This commit is contained in:
parent
7ff66b9af1
commit
fe1f8a8c86
@ -1,25 +0,0 @@
|
||||
heat_template_version: 2014-10-16
|
||||
|
||||
description: >
|
||||
Noop extra config for allnodes extra cluster config
|
||||
|
||||
# Parameters passed from the parent template - note if you maintain
|
||||
# out-of-tree templates they may require additional parameters if the
|
||||
# in-tree templates add a new role.
|
||||
parameters:
|
||||
controller_servers:
|
||||
type: json
|
||||
compute_servers:
|
||||
type: json
|
||||
blockstorage_servers:
|
||||
type: json
|
||||
objectstorage_servers:
|
||||
type: json
|
||||
cephstorage_servers:
|
||||
type: json
|
||||
# Note extra parameters can be defined, then passed data via the
|
||||
# environment parameter_defaults, without modifying the parent template
|
||||
|
||||
#outputs:
|
||||
# Outputs can be passed here and inspected via heat, but they are not
|
||||
# consumed by the parent template
|
@ -50,7 +50,8 @@ resource_registry:
|
||||
# phase, e.g when puppet is applied, but after the pre_deploy phase. Useful when
|
||||
# configuration with knowledge of all nodes in the cluster is required vs single
|
||||
# node configuration in the pre_deploy step.
|
||||
OS::TripleO::AllNodesExtraConfig: extraconfig/all_nodes/default.yaml
|
||||
# See extraconfig/all_nodes/* for examples
|
||||
OS::TripleO::AllNodesExtraConfig: OS::Heat::None
|
||||
|
||||
# TripleO overcloud networks
|
||||
OS::TripleO::Network: network/networks.yaml
|
||||
|
Loading…
x
Reference in New Issue
Block a user