Merge "Use oslo_messaging_rpc_port for nova rpc healthchecks"

This commit is contained in:
Zuul 2019-04-18 11:06:52 +00:00 committed by Gerrit Code Review
commit b0e23c2b41
3 changed files with 33 additions and 2 deletions

View File

@ -272,6 +272,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:
@ -360,6 +370,7 @@ outputs:
value:
service_name: nova_compute
monitoring_subscription: {get_param: MonitoringSubscriptionNovaCompute}
global_config_settings: {get_attr: [RabbitMQService, role_data, global_config_settings]}
config_settings:
map_merge:
- get_attr: [NovaLogging, config_settings]
@ -547,7 +558,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]}

View File

@ -87,6 +87,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}
NovaLogging:
type: OS::TripleO::Services::Logging::NovaCommon
properties:
@ -110,6 +120,7 @@ outputs:
value:
service_name: nova_scheduler
monitoring_subscription: {get_param: MonitoringSubscriptionNovaScheduler}
global_config_settings: {get_attr: [RabbitMQService, role_data, global_config_settings]}
config_settings:
map_merge:
- {get_attr: [NovaBase, role_data, config_settings]}
@ -170,7 +181,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]}

View File

@ -0,0 +1,9 @@
---
fixes:
- |
With 405366fa32583e88c34417e5f46fa574ed8f4e98 the parameters RpcPort,
RpcUserName, RpcPassword and RpcUseSSL got deprecated and
nova::rabbitmq_port removed. As a result the healtcheck get called with
null parameter and fail.
We now get the global_config_settings from RabbitMQService and use
oslo_messaging_rpc_port for the healthcheck.