From: Steven Hardy <shardy@redhat.com>
Date: Wed, 21 Sep 2016 10:16:03 +0000 (+0100)
Subject: Remove hard-coded roles in EnabledServices output
X-Git-Tag: opnfv-6.0.0~1571^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d5a25f96d229c6274c6d9d790e4308c8f555120a;p=apex-tripleo-heat-templates.git

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

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 %}