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.

Conflicts:
>------playbooks/roles/os_glance/templates/glance-api.conf.j2
>------playbooks/roles/os_glance/templates/glance-registry.conf.j2
>------playbooks/roles/os_neutron/defaults/main.yml
>------playbooks/roles/os_neutron/templates/neutron.conf.j2

This backport includes the follow-up patch:
https://review.openstack.org/257268

UpgradeImpact
Bug: #1522506
Change-Id: I1ac7648a545c35f8f77d79f9cb0d9021bdb9e653
(cherry picked from commit 24488f45c6)

etc/openstack_deploy/user_variables.yml

@@ -29,7 +29,6 @@ nova_ceilometer_enabled: False
 # or "rbd" if using ceph backend; the latter will trigger ceph to get
 # installed on glance
 glance_default_store: file
-glance_notification_driver: noop
 
 # `internalURL` will cause glance to speak to swift via ServiceNet, use
 # `publicURL` to communicate with swift over the public network

playbooks/roles/os_cinder/templates/cinder.conf.j2

@@ -94,7 +94,7 @@ enabled_backends={% for backend in cinder_backends|dictsort %}{{ backend.0 }}{%
 
 #Ceilometer configurations
 {% if cinder_ceilometer_enabled %}
-notification_driver = cinder.openstack.common.notifier.rpc_notifier
+notification_driver = messagingv2
 {% endif %}
 
 # All given backend(s)

playbooks/roles/os_glance/defaults/main.yml

@@ -33,8 +33,6 @@ glance_system_comment: glance system user
 glance_system_user_home: "/var/lib/{{ glance_system_user_name }}"
 
 glance_registry_host: "{{ internal_lb_vip_address }}"
-glance_ceilometer_notification_driver: messagingv2
-glance_notification_driver: noop
 glance_rpc_backend: glance.openstack.common.rpc.impl_kombu
 glance_default_store: file
 glance_flavor: "{% if glance_default_store == 'rbd' %}keystone{% else %}keystone+cachemanagement{% endif %}"

playbooks/roles/os_glance/templates/glance-api.conf.j2

@@ -26,11 +26,9 @@ enable_v2_api = {{ glance_enable_v2_api }}
 enable_v2_registry = {{ glance_enable_v2_registry }}
 
 {% if glance_ceilometer_enabled %}
-notification_driver = {{ glance_ceilometer_notification_driver }}
-{% else %}
-notification_driver = {{ glance_notification_driver }}
+notification_driver = messagingv2
 {% endif %}
-{% if glance_notification_driver == "messaging" or (glance_ceilometer_notification_driver == "messagingv2" and glance_ceilometer_enabled) %}
+
 ##### RPC MESSAGING OPTIONS #####
 rpc_backend = {{ glance_rpc_backend }}
 rabbit_hosts = {{ rabbitmq_servers }}
@@ -40,8 +38,6 @@ rabbit_password = {{ rabbitmq_password }}
 rabbit_notification_exchange = glance
 rabbit_notification_topic = notifications
 rabbit_durable_queues = False
-{% endif %}
-
 
 delayed_delete = False
 scrub_time = 43200

playbooks/roles/os_glance/templates/glance-registry.conf.j2

@@ -16,12 +16,20 @@ backlog = 4096
 workers = {{ glance_registry_workers | default(api_threads) }}
 api_limit_max = 1000
 limit_param_default = 25
+
 {% if glance_ceilometer_enabled %}
-notification_driver = {{ glance_notification_driver }}
+notification_driver = messagingv2
+{% endif %}
+
+##### RPC MESSAGING OPTIONS #####
 rpc_backend = {{ glance_rpc_backend }}
 rabbit_hosts = {{ rabbitmq_servers }}
+rabbit_port = {{ rabbitmq_port }}
+rabbit_userid = {{ rabbitmq_userid }}
 rabbit_password = {{ rabbitmq_password }}
-{% endif %}
+rabbit_notification_exchange = glance
+rabbit_notification_topic = notifications
+rabbit_durable_queues = False
 
 [database]
 connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8

playbooks/roles/os_heat/templates/heat.conf.j2

@@ -29,7 +29,7 @@ plugin_dirs = {{ heat_plugin_dirs | join(',') }}
 
 # Ceilometer options
 {% if heat_ceilometer_enabled %}
-notification_driver = heat.openstack.common.notifier.rpc_notifier
+notification_driver = messagingv2
 {% endif %}
 
 

playbooks/roles/os_neutron/defaults/main.yml

@@ -21,6 +21,9 @@ debug: False
 verbose: True
 neutron_fatal_deprecations: False
 
+#Enable/Disable Ceilometer
+neutron_ceilometer_enabled: False
+
 ## neutron User / Group
 neutron_system_user_name: neutron
 neutron_system_group_name: neutron
@@ -122,7 +125,6 @@ neutron_driver_loadbalancer_pool_scheduler: neutron.services.loadbalancer.agent_
 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_quota: neutron.db.quota_db.DbQuotaDriver
 neutron_driver_firewall: neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
 

playbooks/roles/os_neutron/templates/neutron.conf.j2

@@ -35,7 +35,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 }}
-notification_driver = {{ neutron_driver_notification }}
+{% if neutron_ceilometer_enabled %}
+notification_driver = messagingv2
+{% endif %}
 
 # Schedulers
 network_auto_schedule = True