openstack
/
openstack-ansible-os_glance
Code Issues Proposed changes

Fix notification_driver 

[DEFAULT]/notification_driver is deprecated.
New [oslo_messaging_notifications]/driver should be used.

Change-Id: I8322d620f7ded03c2df1e3cbdcd65be6541da6b6
This commit is contained in:
ZhongShengping 2016-07-11 17:21:34 +08:00
parent 374ace641d
commit 1d851dcdc8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/glance-api.conf.j2
View File

@ -23,10 +23,6 @@ enable_v1_registry = {{ glance_enable_v1_registry }}
enable_v2_api = {{ glance_enable_v2_api }}
enable_v2_registry = {{ glance_enable_v2_registry }}
{% if glance_ceilometer_enabled %}
notification_driver = messagingv2
{% endif %}
rpc_backend = {{ glance_rpc_backend }}
delayed_delete = False
@ -36,6 +32,11 @@ image_cache_dir = {{ glance_system_user_home }}/cache/
# defaults to true if RBD is used as default store
show_image_direct_url = {{ glance_show_image_direct_url }}
{% if glance_ceilometer_enabled %}
[oslo_messaging_notifications]
driver = messagingv2
{% endif %}
[task]
task_executor = {{ glance_task_executor }}

8
templates/glance-registry.conf.j2
View File

@ -14,11 +14,13 @@ backlog = 4096
workers = {{ glance_registry_workers | default(api_threads) }}
api_limit_max = 1000
limit_param_default = 25
{% if glance_ceilometer_enabled %}
notification_driver = messagingv2
{% endif %}
rpc_backend = {{ glance_rpc_backend }}
{% if glance_ceilometer_enabled %}
[oslo_messaging_notifications]
driver = messagingv2
{% endif %}
[database]
connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8