openstack
/
tripleo-heat-templates
Code Issues Proposed changes

heat: use oslo_messaging_rpc_port for nova rpc healthchecks 

See I1849926b1d6256de5f4d677de5a9b34d78aad5d0 - this patch does the same
thing but for Heat Engine service.

Change-Id: I1f49c20ce13848564181363886d5f716abb63491
Closes-Bug: #1825339
(cherry picked from commit afe583b396)
This commit is contained in:
Emilien Macchi 2019-04-22 13:03:39 -04:00
parent bb9638c855
commit 63a7d6d92c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deployment/heat/heat-engine-container-puppet.yaml
View File

@ -122,12 +122,23 @@ resources:
HeatEngineLogging:
type: OS::TripleO::Services::Logging::HeatEngine
RabbitMQService:
type: ../rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
outputs:
role_data:
description: Role data for the Heat Engine role.
value:
service_name: heat_engine
monitoring_subscription: {get_param: MonitoringSubscriptionHeatEngine}
global_config_settings: {get_attr: [RabbitMQService, role_data, global_config_settings]}
config_settings:
map_merge:
- get_attr: [HeatBase, role_data, config_settings]
@ -258,7 +269,7 @@ outputs:
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [HeatBase, role_data, config_settings, 'heat::rabbit_port']}
port: {get_attr: [RabbitMQService, role_data, global_config_settings, 'oslo_messaging_rpc_port']}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}