Move per role Services defaults into environment file
authorSteven Hardy <shardy@redhat.com>
Thu, 27 Oct 2016 08:38:43 +0000 (09:38 +0100)
committerGiulio Fidente <gfidente@redhat.com>
Mon, 7 Nov 2016 14:08:26 +0000 (15:08 +0100)
commitd297e02c0396e24b4dcb8ab8daadaee724277d61
tree108f267dc39264f8431c644f146597b27e5e801c
parentf761bf9e35f8f096127b1956f4ea8900c7d3fee5
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
overcloud-resource-registry-puppet.j2.yaml
overcloud.j2.yaml