summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2017-01-04 15:16:01 -0500
committerJames Slagle <jslagle@redhat.com>2017-01-05 12:25:29 -0500
commit81b0d79bb6104da9df63840f33a2d19257c3dbcd (patch)
tree7f62e8a4b70cd40c1e84d8e3325766f0ac635147 /environments
parent4a02aeb22e8f6e27bf8c8ca84422fe9842b8738d (diff)
Merge mysql service_config_settings for nova
The hieradata from the nova-base.yaml service template needs to be available to the role running mysql, which isn't necessarily the same role as nova. nova-base.yaml isn't an actual service template though that is included in any ServiceChain resources, it's outputs need to be merged with an actual nova service template, such as nova-api.yaml. As nova-api.yaml already provides some hieradata for the mysql service in service_config_settings, this patch uses map_merge to combine the 2 values. Change-Id: I4dc684b3611b13f177f9499e69468d3f6ef6fa76 Closes-Bug: #1654058
Diffstat (limited to 'environments')
0 files changed, 0 insertions, 0 deletions