From aa08317745f81933a4ac93006e27ee1ea63cb17d Mon Sep 17 00:00:00 2001 From: Darren Birkett Date: Thu, 3 Dec 2015 15:21:18 +0000 Subject: [PATCH] Tidy up notification_driver implementation across projects The various os_* roles implement the notification driver in the config files in a number of different ways. This commit standardises the implementation. Some of the decisions that were made here (remove the variables for the driver altogether, do not configure notifications at all if not ceilometer) are based on an irc discussion and the outcomes. The following variables have been removed: - glance_ceilometer_notification_driver - glance_notification_driver - neutron_notification_driver If these items need to be set differently, the config_override facility may be used. UpgradeImpact Bug: #1522506 Change-Id: I1ac7648a545c35f8f77d79f9cb0d9021bdb9e653 --- defaults/main.yml | 1 - templates/neutron.conf.j2 | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 80aa25ed..1f6f8a60 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -168,7 +168,6 @@ neutron_driver_loadbalancer_pool_scheduler: neutron_lbaas.services.loadbalancer. neutron_driver_interface: neutron.agent.linux.interface.BridgeInterfaceDriver neutron_driver_metering: neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver neutron_driver_dhcp: neutron.agent.linux.dhcp.Dnsmasq -neutron_driver_notification: messagingv2 neutron_driver_quota: neutron.db.quota.driver.DbQuotaDriver neutron_driver_firewall: neutron.agent.linux.iptables_firewall.IptablesFirewallDriver diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 8ea599d1..7fba07bc 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -39,6 +39,9 @@ auth_strategy = keystone network_scheduler_driver = {{ neutron_driver_network_scheduler }} router_scheduler_driver = {{ neutron_driver_router_scheduler }} loadbalancer_pool_scheduler_driver = {{ neutron_driver_loadbalancer_pool_scheduler }} +{% if neutron_ceilometer_enabled %} +notification_driver = messagingv2 +{% endif %} # Schedulers network_auto_schedule = True