From f7f1a8a6d8cfd4c78ffd256497b32daa5908641e Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 27 Mar 2017 13:57:06 -0400 Subject: 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 --- overcloud.j2.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'overcloud.j2.yaml') 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 -- cgit 1.2.3-korg