From 42a259211b7c0d34dadd9a3bb9837e9deca3b9fc 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 | 2 -- templates/glance-api.conf.j2 | 8 ++------ templates/glance-registry.conf.j2 | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 8d26a27f..ceffaacc 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -53,8 +53,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 %}" diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index d52c17b5..a3a6334b 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -29,14 +29,10 @@ enable_v2_registry = {{ glance_enable_v2_registry }} # {% if glance_ceilometer_enabled %} -notification_driver = {{ glance_ceilometer_notification_driver }} -{% else %} -notification_driver = {{ glance_notification_driver }} -{% endif %} -{% if glance_notification_driver == "messaging" or (glance_ceilometer_notification_driver == "messagingv2" and glance_ceilometer_enabled) %} -rpc_backend = {{ glance_rpc_backend }} +notification_driver = messagingv2 {% endif %} +rpc_backend = {{ glance_rpc_backend }} delayed_delete = False scrub_time = 43200 diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2 index 571f616f..192af924 100644 --- a/templates/glance-registry.conf.j2 +++ b/templates/glance-registry.conf.j2 @@ -16,9 +16,9 @@ workers = {{ glance_registry_workers | default(api_threads) }} api_limit_max = 1000 limit_param_default = 25 {% if glance_ceilometer_enabled %} -notification_driver = {{ glance_notification_driver }} -rpc_backend = {{ glance_rpc_backend }} +notification_driver = messagingv2 {% endif %} +rpc_backend = {{ glance_rpc_backend }} [database] connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8