openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use oslo_messaging_rpc_port for nova rpc healthchecks"

This commit is contained in:
Zuul 2019-05-04 17:22:39 +00:00 committed by Gerrit Code Review
parent 4c3b51cbc4 372ca22483
commit 20e099bbc1
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/nova/nova-ironic-container-puppet.yaml
View File

@ -49,6 +49,16 @@ resources:
MySQLClient:
type: ../../deployment/database/mysql-client.yaml
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}
NovaComputeCommon:
type: ./nova-compute-common-container-puppet.yaml
properties:
@ -74,6 +84,7 @@ outputs:
description: Role data for the Nova Compute service.
value:
service_name: nova_ironic
global_config_settings: {get_attr: [RabbitMQService, role_data, global_config_settings]}
config_settings:
map_merge:
- get_attr: [NovaBase, role_data, config_settings]
@ -143,7 +154,7 @@ outputs:
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [NovaBase, role_data, config_settings, 'nova::rabbit_port']}
port: {get_attr: [RabbitMQService, role_data, global_config_settings, 'oslo_messaging_rpc_port']}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}