aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-06-22 11:11:40 -0400
committerSteven Hardy <shardy@redhat.com>2016-07-01 10:05:04 +0100
commit68562d07cc59d14a724387dbd6018a5aaad2ca7f (patch)
tree409e25dcdcab6a64f5973c6dc201d9b48ba7c5ba /puppet/services
parent30a11c81b16b6dde9dc80800f8c807421ae1f3fa (diff)
Output generic role_data in services.yaml
This patch updates puppet/services/services.yaml (currently the only interface for 'services' in t-h-t) so that we return a more generic 'role_data' Heat output. This is a move towards making the services themselves a bit more generic so we can accommodate other deployment types (containers, etc.) Change-Id: I8bc32c59a48e6d5f0caa2f26fab394d5d992a4a5
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/services.yaml11
1 files changed, 5 insertions, 6 deletions
diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
index 7ed880fc..91f0e049 100644
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@ -27,9 +27,8 @@ resources:
EndpointMap: {get_param: EndpointMap}
outputs:
- config_settings:
- description: Configuration settings.
- value: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
- step_config:
- description: Step configuration.
- value: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}
+ role_data:
+ description: Combined Role data for this set of services.
+ value:
+ config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
+ step_config: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}