Skip to content

Commit

Permalink
Account for oslo_config deprecations in glance config templates
Browse files Browse the repository at this point in the history
Specific changes are based on glance-api and glance-registry logging:
 * Option "notification_topics" from group "DEFAULT" is deprecated. Use option
   "topics" from group "oslo_messaging_notifications"
 * Option "auth_plugin" from group "keystone_authtoken" is deprecated. Use
   option "auth_type" from group "keystone_authtoken".

Change-Id: I329c0a3173584109ef1e6f500fdd55e76c10bb8b
  • Loading branch information
Travis Truman committed Mar 10, 2016
1 parent b00e9df commit d8b6871
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
9 changes: 3 additions & 6 deletions templates/glance-api.conf.j2
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion templates/glance-registry.conf.j2
Expand Up @@ -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 }}
Expand Down

0 comments on commit d8b6871

Please sign in to comment.