openstack/tripleo-heat-templates
Code Issues Proposed changes

Update minion rabbit credentials

Browse Source 
By default the undercloud uses
deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml for the
notification messaging credentials. This services reuses the Rpc*
settings for the notify transport url. Previously the minion would split
out the notify and rpc transport urls. This doesn't work if the notify
credentials are never setup.

Closes-Bug: #1880956
Change-Id: I2b38cb1a2c4340ff173d349d0f3b49f6f4997262
This commit is contained in:
Alex Schultz 2020-05-27 07:54:21 -06:00 committed by Emilien Macchi
parent 9af096189b
commit 93f07d36cc
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
deployment/undercloud/minion-rabbitmq-puppet.yaml
View File

@ -30,23 +30,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry. via parameter_defaults in the resource registry.
type: json type: json
NotifyPort:
default: 5672
description: The network port for messaging Notify backend
type: number
NotifyUserName:
default: guest
description: The username for messaging Notifications
type: string
NotifyPassword:
description: The password for messaging Notifications
type: string
hidden: true
NotifyUseSSL:
default: false
description: Messaging Notification client subscriber parameter to specify
an SSL connection to the messaging host.
type: string
RpcPort: RpcPort:
default: 5672 default: 5672
description: The network port for messaging backend description: The network port for messaging backend
@ -73,10 +56,10 @@ outputs:
service_name: oslo_messaging_minion service_name: oslo_messaging_minion
global_config_settings: global_config_settings:
oslo_messaging_notify_scheme: rabbit oslo_messaging_notify_scheme: rabbit
oslo_messaging_notify_user_name: {get_param: NotifyUserName} oslo_messaging_notify_user_name: {get_param: RpcUserName}
oslo_messaging_notify_password: {get_param: NotifyPassword} oslo_messaging_notify_password: {get_param: RpcPassword}
oslo_messaging_notify_use_ssl: {get_param: NotifyUseSSL} oslo_messaging_notify_use_ssl: {get_param: RpcUseSSL}
oslo_messaging_notify_port: {get_param: NotifyPort} oslo_messaging_notify_port: {get_param: RpcPort}
oslo_messaging_rpc_scheme: rabbit oslo_messaging_rpc_scheme: rabbit
oslo_messaging_rpc_user_name: {get_param: RpcUserName} oslo_messaging_rpc_user_name: {get_param: RpcUserName}
oslo_messaging_rpc_password: {get_param: RpcPassword} oslo_messaging_rpc_password: {get_param: RpcPassword}