aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.j2.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-03-27 13:57:06 -0400
committerDan Prince <dprince@redhat.com>2017-03-27 13:57:06 -0400
commitf7f1a8a6d8cfd4c78ffd256497b32daa5908641e (patch)
tree7ea42ff0bf9f25ee30b356f32c1751b4f1511ca1 /overcloud.j2.yaml
parent4bd2a9d959a3d745e94224c32e8c9ea5de69f859 (diff)
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
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r--overcloud.j2.yaml12
1 files changed, 6 insertions, 6 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 7b78011..de7cc0d 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