summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-09-21 11:16:03 +0100
committerSteven Hardy <shardy@redhat.com>2016-09-23 10:15:27 +0100
commitd5a25f96d229c6274c6d9d790e4308c8f555120a (patch)
treeb1857ddff4680ebcf3dfb03360efcb1df3f70b65
parent56057325a95bb521e2ed8a322223c1f858ab25fe (diff)
Remove hard-coded roles in EnabledServices output
This was missed during custom-roles work, and will mean deployments break if any of the existing roles are removed from roles_data.yaml Change-Id: Ia737b48a0dd272f8d706b7458764201fa47cb0bb Closes-Bug: #1625755
-rw-r--r--overcloud.j2.yaml8
1 files changed, 3 insertions, 5 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index aad1af62..c3648734 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -536,8 +536,6 @@ outputs:
EnabledServices:
description: The services enabled on each role
value:
- Controller: {get_attr: [ControllerServiceChain, role_data, service_names]}
- Compute: {get_attr: [ComputeServiceChain, role_data, service_names]}
- BlockStorage: {get_attr: [BlockStorageServiceChain, role_data, service_names]}
- ObjectStorage: {get_attr: [ObjectStorageServiceChain, role_data, service_names]}
- CephStorage: {get_attr: [CephStorageServiceChain, role_data, service_names]}
+{% for role in roles %}
+ {{role.name}}: {get_attr: [{{role.name}}ServiceChain, role_data, service_names]}
+{% endfor %}