From f8f108f09dfff212ae175bdec2dd8a363a165318 Mon Sep 17 00:00:00 2001 From: Darren Birkett Date: Wed, 2 Dec 2015 14:17:26 +0000 Subject: [PATCH] turn neutron notifications off by default unless something (ceilometer) is going to consume the notification messages, we should turn notifications off. This commit follows the same pattern that the other roles use for enabling/disabling notifications. Bug: #1522042 Change-Id: If6d4f0fd1c441a6bd8dc48f6bea8a4906a9d96b2 --- doc/source/install-guide/configure-ceilometer.rst | 2 ++ etc/openstack_deploy/user_variables.yml | 1 + playbooks/roles/os_neutron/defaults/main.yml | 2 +- playbooks/roles/os_neutron/templates/neutron.conf.j2 | 6 +++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/source/install-guide/configure-ceilometer.rst b/doc/source/install-guide/configure-ceilometer.rst index b0d5179b7a..06c7f9f4a7 100644 --- a/doc/source/install-guide/configure-ceilometer.rst +++ b/doc/source/install-guide/configure-ceilometer.rst @@ -178,6 +178,8 @@ This configures glance to send notifications to the message bus: This configures nova to send notifications to the message bus: ``nova_ceilometer_enabled: False`` +This configures neutron to send notifications to the message bus: +``neutron_ceilometer_enabled: False`` Once all of these steps are complete, you are ready to run the os-ceilometer-install.yml playbook! Or, if deploying a new stack, simply run diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml index 06d9ee2d11..2e4b3d02da 100644 --- a/etc/openstack_deploy/user_variables.yml +++ b/etc/openstack_deploy/user_variables.yml @@ -23,6 +23,7 @@ heat_ceilometer_enabled: False cinder_ceilometer_enabled: False glance_ceilometer_enabled: False nova_ceilometer_enabled: False +neutron_ceilometer_enabled: False ## Aodh Options aodh_db_type: mongodb diff --git a/playbooks/roles/os_neutron/defaults/main.yml b/playbooks/roles/os_neutron/defaults/main.yml index 67c4c1aa81..80aa25ed90 100644 --- a/playbooks/roles/os_neutron/defaults/main.yml +++ b/playbooks/roles/os_neutron/defaults/main.yml @@ -168,7 +168,7 @@ 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: neutron.openstack.common.notifier.rpc_notifier +neutron_driver_notification: messagingv2 neutron_driver_quota: neutron.db.quota.driver.DbQuotaDriver neutron_driver_firewall: neutron.agent.linux.iptables_firewall.IptablesFirewallDriver diff --git a/playbooks/roles/os_neutron/templates/neutron.conf.j2 b/playbooks/roles/os_neutron/templates/neutron.conf.j2 index 8dbd01388d..8ea599d16e 100644 --- a/playbooks/roles/os_neutron/templates/neutron.conf.j2 +++ b/playbooks/roles/os_neutron/templates/neutron.conf.j2 @@ -17,6 +17,11 @@ network_device_mtu = {{ neutron_network_device_mtu }} allow_overlapping_ips = True vlan_transparent = False +#Ceilometer configurations +{% if neutron_ceilometer_enabled %} +notification_driver = {{ neutron_driver_notification }} +{% endif %} + # Plugins core_plugin = {{ neutron_plugin_core }} {% if neutron_plugin_type != 'plumgrid' %} @@ -34,7 +39,6 @@ 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 }} -notification_driver = {{ neutron_driver_notification }} # Schedulers network_auto_schedule = True