openstack
/
charm-glance
Code Issues Proposed changes

Rebase against lp:charms/glance to include sql_connection fix.

This commit is contained in:
Adam Gandelman 2013-03-01 15:40:29 -08:00
parent 00c8c4bf06 6db76f9158
commit f84dd69a55
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/glance-relations
View File

@ -73,8 +73,8 @@ function db_changed {
set_or_update sql_connection "mysql://$db_user:$db_password@$db_host/$glance_db" registry
# folsom requires a db connection setting in glance-api.conf, as well.
[[ "$rel" == "folsom" ]] &&
# since folsom, a db connection setting in glance-api.conf is required.
[[ "$rel" != "essex" ]] &&
set_or_update sql_connection "mysql://$db_user:$db_password@$db_host/$glance_db" api
if eligible_leader 'res_glance_vip'; then

2
revision
View File

@ -1 +1 @@
80
81