From 9508e525eda4eb883bdde1efce1c517f4f1d3f5d Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Wed, 19 Sep 2018 08:20:41 -0400 Subject: [PATCH] Update messaging notification configuration This patch add the conditional inclusion of the notification section of the service configuration. This ensures that oslo.messaging notifications use the correct transport for deployments that have separate rpc and notify messaging backends. For example, if the transport_url is not provided in the notification section of the service configuration, the transport_url specified in the default section will be used instead. This patch conditionally selects the notifier driver. The noop driver will be selected when notification publishing is disabled. The messagingv2 driver is selected when notification publishing is enabled. Change-Id: Iaadc0d852c003e653e00b4736ddc28f16ddfec5a Closes-Bug: #1794320 --- defaults/main.yml | 3 +++ templates/magnum.conf.j2 | 1 + 2 files changed, 4 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 2e43ec2..b613bf7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,6 +16,9 @@ ## Verbosity Options debug: False +# Enable/Disable Ceilometer +magnum_ceilometer_enabled: False + # Set the host which will execute the shade modules # for the service setup. The host must already have # clouds.yaml properly configured. diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index 7dbe2b9..63fe510 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -69,6 +69,7 @@ endpoint_type = internalURL endpoint_type = internalURL [oslo_messaging_notifications] +driver = {% if magnum_ceilometer_enabled %}messagingv2{% else %}noop{% endif %} transport_url = {{ magnum_oslomsg_notify_transport }}://{% for host in magnum_oslomsg_notify_servers.split(',') %}{{ magnum_oslomsg_notify_userid }}:{{ magnum_oslomsg_notify_password }}@{{ host }}:{{ magnum_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ magnum_oslomsg_notify_vhost }}{% if magnum_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} [oslo_messaging_rabbit]