Simplify database_connection_url
* does not expects dynamic scoping.
* does not uses eval.
Change-Id: I5ba4e5b7ffaabbb3c2bddadf9e53a2875de8b7c0
diff --git a/lib/nova b/lib/nova
index 849ec57..0e8d1aa 100644
--- a/lib/nova
+++ b/lib/nova
@@ -377,12 +377,9 @@
iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT"
iniset $NOVA_CONF DEFAULT osapi_compute_extension "nova.api.openstack.compute.contrib.standard_extensions"
iniset $NOVA_CONF DEFAULT my_ip "$HOST_IP"
- local dburl
- database_connection_url dburl nova
- iniset $NOVA_CONF DEFAULT sql_connection "$dburl"
+ iniset $NOVA_CONF DEFAULT sql_connection `database_connection_url nova`
if is_baremetal; then
- database_connection_url dburl nova_bm
- iniset $NOVA_CONF baremetal sql_connection $dburl
+ iniset $NOVA_CONF baremetal sql_connection `database_connection_url nova_bm`
fi
iniset $NOVA_CONF DEFAULT libvirt_type "$LIBVIRT_TYPE"
iniset $NOVA_CONF DEFAULT libvirt_cpu_mode "none"