From 23d6d5068752358c1d3bbacc314594b1b50e2fc8 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Fri, 6 Mar 2015 15:24:22 -0800 Subject: [PATCH] Stop using deprecated oslo_concurrency and sql_connection config options As per the logs: Option "lock_path" from group "DEFAULT" is deprecated. Use option "lock_path" from group "oslo_concurrency". Option "sql_connection" from group "DEFAULT" is deprecated. Use option "connection" from group "database". Change-Id: I2109cec07ebee916c9ce0ccd24bd9a47d8d3c688 --- lib/cinder | 4 ++-- lib/ironic | 2 +- lib/nova | 6 +++--- lib/tempest | 2 +- lib/trove | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/cinder b/lib/cinder index 0d157dd78e..8ae2581169 100644 --- a/lib/cinder +++ b/lib/cinder @@ -230,12 +230,12 @@ function configure_cinder { iniset $CINDER_CONF DEFAULT my_ip "$CINDER_SERVICE_HOST" 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 diff --git a/lib/ironic b/lib/ironic index bc30cdbeba..a65ea8807b 100644 --- a/lib/ironic +++ b/lib/ironic @@ -273,7 +273,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. diff --git a/lib/nova b/lib/nova index e9e78c7bc4..81064380c0 100644 --- a/lib/nova +++ b/lib/nova @@ -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" @@ -575,7 +575,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 diff --git a/lib/tempest b/lib/tempest index f856ce05f9..7464499d43 100644 --- a/lib/tempest +++ b/lib/tempest @@ -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 diff --git a/lib/trove b/lib/trove index d77798308b..31c3eef5ea 100644 --- a/lib/trove +++ b/lib/trove @@ -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