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/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index 8772867..c676521 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -68,7 +68,7 @@
 
     iniset $CEILOMETER_CONF DEFAULT notification_topics 'notifications,glance_notifications'
     iniset $CEILOMETER_CONF DEFAULT verbose True
-    iniset $CEILOMETER_CONF DEFAULT sql_connection $BASE_SQL_CONN/nova?charset=utf8
+    iniset $CEILOMETER_CONF DEFAULT `database_connection_url nova`
 
     # Install the policy file for the API server
     cp $CEILOMETER_DIR/etc/ceilometer/policy.json $CEILOMETER_CONF_DIR