From 40e2f508e42a793379c3bd1184bf1b7f36faa4d4 Mon Sep 17 00:00:00 2001 From: Allen Gao Date: Tue, 19 Jan 2016 08:53:37 +0800 Subject: [PATCH] Remove option 'DEFAULT/verbose' Option "verbose" from group "DEFAULT" is deprecated for removal. Its value may be silently ignored in the future. If this option is not set explicitly, there is no such warning. Furthermore, the default value of verbose is true, so there is no need to set this value in config files. TrivialFix Change-Id: I581238e661c2eb0c29dd915d1b1e4773dcdeb4c8 --- lib/cinder | 1 - lib/neutron-legacy | 6 ------ 2 files changed, 7 deletions(-) diff --git a/lib/cinder b/lib/cinder index 144f41beea..3aea05023f 100644 --- a/lib/cinder +++ b/lib/cinder @@ -259,7 +259,6 @@ function configure_cinder { iniset $CINDER_CONF DEFAULT auth_strategy keystone iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL - iniset $CINDER_CONF DEFAULT verbose True iniset $CINDER_CONF DEFAULT iscsi_helper "$CINDER_ISCSI_HELPER" iniset $CINDER_CONF database connection `database_connection_url cinder` diff --git a/lib/neutron-legacy b/lib/neutron-legacy index 9497a23595..8bddcd9b3f 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -993,7 +993,6 @@ function _configure_neutron_debug_command { cp $NEUTRON_DIR/etc/l3_agent.ini.sample $NEUTRON_TEST_CONFIG_FILE - iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT verbose False iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT debug False iniset $NEUTRON_TEST_CONFIG_FILE AGENT root_helper "$Q_RR_COMMAND" if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then @@ -1009,7 +1008,6 @@ function _configure_neutron_dhcp_agent { cp $NEUTRON_DIR/etc/dhcp_agent.ini.sample $Q_DHCP_CONF_FILE - iniset $Q_DHCP_CONF_FILE DEFAULT verbose True iniset $Q_DHCP_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $Q_DHCP_CONF_FILE AGENT root_helper "$Q_RR_COMMAND" if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then @@ -1041,7 +1039,6 @@ function _configure_neutron_l3_agent { cp $NEUTRON_DIR/etc/l3_agent.ini.sample $Q_L3_CONF_FILE - iniset $Q_L3_CONF_FILE DEFAULT verbose True iniset $Q_L3_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $Q_L3_CONF_FILE AGENT root_helper "$Q_RR_COMMAND" if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then @@ -1062,7 +1059,6 @@ function _configure_neutron_l3_agent { function _configure_neutron_metadata_agent { cp $NEUTRON_DIR/etc/metadata_agent.ini.sample $Q_META_CONF_FILE - iniset $Q_META_CONF_FILE DEFAULT verbose True iniset $Q_META_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP iniset $Q_META_CONF_FILE AGENT root_helper "$Q_RR_COMMAND" @@ -1126,7 +1122,6 @@ function _configure_neutron_plugin_agent { if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then iniset /$Q_PLUGIN_CONF_FILE agent root_helper_daemon "$Q_RR_DAEMON_COMMAND" fi - iniset $NEUTRON_CONF DEFAULT verbose True iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL # Configure agent for plugin @@ -1146,7 +1141,6 @@ function _configure_neutron_service { iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES fi - iniset $NEUTRON_CONF DEFAULT verbose True iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $NEUTRON_CONF oslo_policy policy_file $Q_POLICY_FILE iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP