openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
fd15a091f7. This
breaks the composable undercloud work (undercloud-containers ci job as
well).

Change-Id: Ie30b2573dc4d2b45ebc0afc0e0d73bfdf41e4d4b
Closes-bug: #1676528
This commit is contained in:
Dan Prince 2017-03-27 13:57:06 -04:00
parent 4bd2a9d959
commit f7f1a8a6d8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
overcloud.j2.yaml
View File

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