From: Dan Prince <dprince@redhat.com>
Date: Mon, 27 Mar 2017 17:57:06 +0000 (-0400)
Subject: Remove 'Controller' role references from overcloud.j2.yaml
X-Git-Tag: opnfv-6.0.0~855^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f7f1a8a6d8cfd4c78ffd256497b32daa5908641e;p=apex-tripleo-heat-templates.git

Remove 'Controller' role references from overcloud.j2.yaml

This patch again removes hard coded role references to
the overcloud.yaml template that was added in
fd15a091f7ab6927833275df17b96ecacc2b1827. This
breaks the composable undercloud work (undercloud-containers ci job as
well).

Change-Id: Ie30b2573dc4d2b45ebc0afc0e0d73bfdf41e4d4b
Closes-bug: #1676528
---

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 7b780112..de7cc0d5 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -581,22 +581,22 @@ resources:
         - ' '
         - - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [Controller, external_ip_address]}
+              data: {get_attr: [{{primary_role_name}}, external_ip_address]}
           - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [Controller, internal_api_ip_address]}
+              data: {get_attr: [{{primary_role_name}}, internal_api_ip_address]}
           - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [Controller, storage_ip_address]}
+              data: {get_attr: [{{primary_role_name}}, storage_ip_address]}
           - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [Controller, storage_mgmt_ip_address]}
+              data: {get_attr: [{{primary_role_name}}, storage_mgmt_ip_address]}
           - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [Controller, tenant_ip_address]}
+              data: {get_attr: [{{primary_role_name}}, tenant_ip_address]}
           - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [Controller, management_ip_address]}
+              data: {get_attr: [{{primary_role_name}}, management_ip_address]}
 
   UpdateWorkflow:
     type: OS::TripleO::Tasks::UpdateWorkflow