openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Merge "Account for oslo_config deprecations in glance config templates"

Browse Source
This commit is contained in:
Jenkins 2016-03-11 07:11:05 +00:00 committed by Gerrit Code Review
commit a43365b22d
2 changed files with 4 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

@ -24,12 +24,9 @@ enable_v1_registry = {{ glance_enable_v1_registry }}
enable_v2_api = {{ glance_enable_v2_api }}
enable_v2_registry = {{ glance_enable_v2_registry }}
#
# From oslo.messaging
#
{% if glance_ceilometer_enabled %}
notification_driver = messagingv2
[oslo_messaging_notifications]
driver = messagingv2
{% endif %}
rpc_backend = {{ glance_rpc_backend }}
@ -49,7 +46,7 @@ connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_
[keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ glance_keystone_auth_plugin }}
auth_type = {{ glance_keystone_auth_plugin }}
signing_dir = {{ glance_system_user_home }}/cache/api
auth_url = {{ keystone_service_adminurl }}
auth_uri = {{ keystone_service_internaluri }}

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

@ -25,7 +25,7 @@ connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_
[keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ glance_keystone_auth_plugin }}
auth_type = {{ glance_keystone_auth_plugin }}
signing_dir = {{ glance_system_user_home }}/cache/registry/
auth_url = {{ keystone_service_adminurl }}
auth_uri = {{ keystone_service_internaluri }}