Browse Source

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
(cherry picked from commit da7d9d97da)
changes/42/394442/1
Steven Hardy 5 years ago
committed by Giulio Fidente
parent
commit
a9ff4c53fb
  1. 5
      overcloud-resource-registry-puppet.j2.yaml
  2. 1
      overcloud.j2.yaml

5
overcloud-resource-registry-puppet.j2.yaml

@ -205,3 +205,8 @@ resource_registry:
parameter_defaults:
EnablePackageInstall: false
SoftwareConfigTransport: POLL_TEMP_URL
{% for role in roles %}
# Parameters generated for {{role.name}} Role
{{role.name}}Services: {{role.ServicesDefault|default([])}}
{% endfor %}

1
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

Loading…
Cancel
Save