@@ -229,12 +229,12 @@ function configure_cinder {

     iniset $CINDER_CONF DEFAULT verbose True

     iniset $CINDER_CONF DEFAULT iscsi_helper tgtadm

-    iniset $CINDER_CONF DEFAULT sql_connection `database_connection_url cinder`

+    iniset $CINDER_CONF database connection `database_connection_url cinder`

     iniset $CINDER_CONF DEFAULT api_paste_config $CINDER_API_PASTE_INI

     iniset $CINDER_CONF DEFAULT rootwrap_config "$CINDER_CONF_DIR/rootwrap.conf"

     iniset $CINDER_CONF DEFAULT osapi_volume_extension cinder.api.contrib.standard_extensions

     iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH

-    iniset $CINDER_CONF DEFAULT lock_path $CINDER_STATE_PATH

+    iniset $CINDER_CONF oslo_concurrency lock_path $CINDER_STATE_PATH

     iniset $CINDER_CONF DEFAULT periodic_interval $CINDER_PERIODIC_INTERVAL

     # NOTE(thingee): Cinder V1 API is deprecated and defaults to off as of

     # Juno. Keep it enabled so we can continue testing while it's still

@@ -274,7 +274,7 @@ function configure_ironic {

     cp $IRONIC_DIR/etc/ironic/ironic.conf.sample $IRONIC_CONF_FILE

     iniset $IRONIC_CONF_FILE DEFAULT debug True

     inicomment $IRONIC_CONF_FILE DEFAULT log_file

-    iniset $IRONIC_CONF_FILE DEFAULT sql_connection `database_connection_url ironic`

+    iniset $IRONIC_CONF_FILE database connection `database_connection_url ironic`

     iniset $IRONIC_CONF_FILE DEFAULT state_path $IRONIC_STATE_PATH

     iniset $IRONIC_CONF_FILE DEFAULT use_syslog $SYSLOG

     # Configure Ironic conductor, if it was enabled.

@@ -437,7 +437,7 @@ function create_nova_conf {

     iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST"

     iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT"

     iniset $NOVA_CONF DEFAULT my_ip "$HOST_IP"

-    iniset $NOVA_CONF DEFAULT sql_connection `database_connection_url nova`

+    iniset $NOVA_CONF database connection `database_connection_url nova`

     iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"

     iniset $NOVA_CONF osapi_v3 enabled "True"

@@ -471,7 +471,7 @@ function create_nova_conf {

     if [ -n "$NOVA_STATE_PATH" ]; then

         iniset $NOVA_CONF DEFAULT state_path "$NOVA_STATE_PATH"

-        iniset $NOVA_CONF DEFAULT lock_path "$NOVA_STATE_PATH"

+        iniset $NOVA_CONF oslo_concurrency lock_path "$NOVA_STATE_PATH"

     fi

     if [ -n "$NOVA_INSTANCES_PATH" ]; then

         iniset $NOVA_CONF DEFAULT instances_path "$NOVA_INSTANCES_PATH"

@@ -577,7 +577,7 @@ function create_nova_conf {

 function init_nova_cells {

     if is_service_enabled n-cell; then

         cp $NOVA_CONF $NOVA_CELLS_CONF

-        iniset $NOVA_CELLS_CONF DEFAULT sql_connection `database_connection_url $NOVA_CELLS_DB`

+        iniset $NOVA_CELLS_CONF database connection `database_connection_url $NOVA_CELLS_DB`

         iniset $NOVA_CELLS_CONF DEFAULT rabbit_virtual_host child_cell

         iniset $NOVA_CELLS_CONF DEFAULT dhcpbridge_flagfile $NOVA_CELLS_CONF

         iniset $NOVA_CELLS_CONF cells enable True

@@ -275,7 +275,7 @@ function configure_tempest {

     iniset $TEMPEST_CONFIG DEFAULT use_syslog $SYSLOG

     # Oslo

-    iniset $TEMPEST_CONFIG DEFAULT lock_path $TEMPEST_STATE_PATH

+    iniset $TEMPEST_CONFIG oslo_concurrency lock_path $TEMPEST_STATE_PATH

     mkdir -p $TEMPEST_STATE_PATH

     iniset $TEMPEST_CONFIG DEFAULT use_stderr False

     iniset $TEMPEST_CONFIG DEFAULT log_file tempest.log

@@ -136,7 +136,7 @@ function configure_trove {

     iniset $TROVE_CONF DEFAULT rabbit_userid $RABBIT_USERID

     iniset $TROVE_CONF DEFAULT rabbit_password $RABBIT_PASSWORD

-    iniset $TROVE_CONF DEFAULT sql_connection `database_connection_url trove`

+    iniset $TROVE_CONF database connection `database_connection_url trove`

     iniset $TROVE_CONF DEFAULT default_datastore $TROVE_DATASTORE_TYPE

     setup_trove_logging $TROVE_CONF

     iniset $TROVE_CONF DEFAULT trove_api_workers "$API_WORKERS"

@@ -149,7 +149,7 @@ function configure_trove {

         iniset $TROVE_TASKMANAGER_CONF DEFAULT rabbit_userid $RABBIT_USERID

         iniset $TROVE_TASKMANAGER_CONF DEFAULT rabbit_password $RABBIT_PASSWORD

-        iniset $TROVE_TASKMANAGER_CONF DEFAULT sql_connection `database_connection_url trove`

+        iniset $TROVE_TASKMANAGER_CONF database connection `database_connection_url trove`

         iniset $TROVE_TASKMANAGER_CONF DEFAULT taskmanager_manager trove.taskmanager.manager.Manager

         iniset $TROVE_TASKMANAGER_CONF DEFAULT nova_proxy_admin_user radmin

         iniset $TROVE_TASKMANAGER_CONF DEFAULT nova_proxy_admin_tenant_name trove

@@ -162,7 +162,7 @@ function configure_trove {

     if is_service_enabled tr-cond; then

         iniset $TROVE_CONDUCTOR_CONF DEFAULT rabbit_userid $RABBIT_USERID

         iniset $TROVE_CONDUCTOR_CONF DEFAULT rabbit_password $RABBIT_PASSWORD

-        iniset $TROVE_CONDUCTOR_CONF DEFAULT sql_connection `database_connection_url trove`

+        iniset $TROVE_CONDUCTOR_CONF database connection `database_connection_url trove`

         iniset $TROVE_CONDUCTOR_CONF DEFAULT nova_proxy_admin_user radmin

         iniset $TROVE_CONDUCTOR_CONF DEFAULT nova_proxy_admin_tenant_name trove

         iniset $TROVE_CONDUCTOR_CONF DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS