Merge "Remove hard-coded roles in EnabledServices output"

1 files changed, 3 insertions, 5 deletions

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 5c75a66f..e2ff4c14 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -551,8 +551,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 %}