aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.j2.yaml
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-10-27 09:38:43 +0100
committerGiulio Fidente <gfidente@redhat.com>2016-11-07 15:08:26 +0100
commitd297e02c0396e24b4dcb8ab8daadaee724277d61 (patch)
tree108f267dc39264f8431c644f146597b27e5e801c /overcloud.j2.yaml
parentf761bf9e35f8f096127b1956f4ea8900c7d3fee5 (diff)
Move per role Services defaults into environment file
For parameter merge strategies to work we need to merge multiple environment files, which doesn't consider the defaults defined in the heat template. Moving where we define these defaults will enable the merge strategies applied when appending services to roles in environment files to work. Change-Id: I1ef1ad685c8a15308d051665c576a98b277f2496 Closes-Bug: #1635409
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r--overcloud.j2.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 3e4dae8c..47c73f8e 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -121,7 +121,6 @@ parameters:
resource_registry) which represent nested stacks
for each service that should get installed on the {{role.name}} role.
type: comma_delimited_list
- default: {{role.ServicesDefault|default([])}}
{{role.name}}Count:
description: Number of {{role.name}} nodes to deploy