openstack/openstack-ansible
Code Issues Proposed changes

Create [database] section in glance configs

Browse Source 
The sql_connection configuration under [DEFAULT] is now deprecated in
favour of connection under [database].  This change updates
glance-api.conf and glance-registry.conf to reflect this.

Change-Id: I170e169a4f4807359e21723cd186a8d54835f48e
Closes-Bug: #1399422
This commit is contained in:
Matt Thompson 2014-12-09 14:43:05 +00:00
parent 26cc68b7fc
commit 48999a74f5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpc_deployment/roles/glance_common/templates/glance-api.conf
View File

@ -3,7 +3,6 @@ verbose = {{ verbose }}
debug = {{ debug }}
log_file = /var/log/glance/glance-api.log
use_syslog = False
sql_connection = mysql://{{ container_mysql_user }}:{{ container_mysql_password }}@{{ mysql_address }}/{{ container_database }}?charset=utf8
default_store = {{ default_store }}
known_stores = glance.store.filesystem.Store,
glance.store.http.Store,
@ -55,6 +54,9 @@ swift_store_retry_get_count = 5
swift_store_endpoint_type = {{ swift_store_endpoint_type }}
{% endif %}
[database]
connection = mysql://{{ container_mysql_user }}:{{ container_mysql_password }}@{{ mysql_address }}/{{ container_database }}?charset=utf8
[keystone_authtoken]
signing_dir = /var/lib/glance/cache/api
identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}

4
rpc_deployment/roles/glance_common/templates/glance-registry.conf
View File

@ -3,13 +3,15 @@ verbose = {{ verbose }}
debug = {{ debug }}
log_file = /var/log/glance/glance-registry.log
use_syslog = False
sql_connection = mysql://{{ container_mysql_user }}:{{ container_mysql_password }}@{{ mysql_address }}/{{ container_database }}?charset=utf8
bind_host = 0.0.0.0
bind_port = 9191
backlog = 4096
api_limit_max = 1000
limit_param_default = 25
[database]
connection = mysql://{{ container_mysql_user }}:{{ container_mysql_password }}@{{ mysql_address }}/{{ container_database }}?charset=utf8
[keystone_authtoken]
signing_dir = /var/lib/glance/cache/registry/
identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}