Comment 9 for bug 1635409

Reviewed: https://review.openstack.org/394442
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=a9ff4c53fb1def00d61c1f08a3ef81a1f173a27b
Submitter: Jenkins
Branch: stable/newton

commit a9ff4c53fb1def00d61c1f08a3ef81a1f173a27b
Author: Steven Hardy <email address hidden>
Date: Thu Oct 27 09:38:43 2016 +0100

    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 da7d9d97da28bf50b0cc6fb5110ac7eb44c70224)