commit 7e79d9139f931e45f732de9a39cc54bedd95bd6f
author Attila Fazekas <afazekas@redhat.com> Sun Mar 03 12:23:04 2013 +0100
committer Attila Fazekas <afazekas@redhat.com> Sun Mar 03 13:13:36 2013 +0100
tree 7bf48a4af954193c655e2365ec26b1616717e712
parent 48053c791d32d3b61673b2061f63c36cd62861bb

Simplify database_connection_url

* does not expects dynamic scoping.
* does not uses eval.

Change-Id: I5ba4e5b7ffaabbb3c2bddadf9e53a2875de8b7c0

lib/glance

diff --git a/lib/glance b/lib/glance
index 87c160e..dd99658 100644
--- a/lib/glance
+++ b/lib/glance
@@ -81,8 +81,7 @@
     cp $GLANCE_DIR/etc/glance-registry.conf $GLANCE_REGISTRY_CONF
     iniset $GLANCE_REGISTRY_CONF DEFAULT debug True
     inicomment $GLANCE_REGISTRY_CONF DEFAULT log_file
-    local dburl
-    database_connection_url dburl glance
+    local dburl=`database_connection_url glance`
     iniset $GLANCE_REGISTRY_CONF DEFAULT sql_connection $dburl
     iniset $GLANCE_REGISTRY_CONF DEFAULT use_syslog $SYSLOG
     iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone