Browse code
Merge "Remove option 'DEFAULT/verbose'"
Jenkins authored on 2016/01/28 07:50:56Showing 2 changed files
| ... | ... |
@@ -259,7 +259,6 @@ function configure_cinder {
|
| 259 | 259 |
|
| 260 | 260 |
iniset $CINDER_CONF DEFAULT auth_strategy keystone |
| 261 | 261 |
iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
| 262 |
- iniset $CINDER_CONF DEFAULT verbose True |
|
| 263 | 262 |
|
| 264 | 263 |
iniset $CINDER_CONF DEFAULT iscsi_helper "$CINDER_ISCSI_HELPER" |
| 265 | 264 |
iniset $CINDER_CONF database connection `database_connection_url cinder` |
| ... | ... |
@@ -993,7 +993,6 @@ function _configure_neutron_debug_command {
|
| 993 | 993 |
|
| 994 | 994 |
cp $NEUTRON_DIR/etc/l3_agent.ini.sample $NEUTRON_TEST_CONFIG_FILE |
| 995 | 995 |
|
| 996 |
- iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT verbose False |
|
| 997 | 996 |
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT debug False |
| 998 | 997 |
iniset $NEUTRON_TEST_CONFIG_FILE AGENT root_helper "$Q_RR_COMMAND" |
| 999 | 998 |
if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then |
| ... | ... |
@@ -1009,7 +1008,6 @@ function _configure_neutron_dhcp_agent {
|
| 1009 | 1009 |
|
| 1010 | 1010 |
cp $NEUTRON_DIR/etc/dhcp_agent.ini.sample $Q_DHCP_CONF_FILE |
| 1011 | 1011 |
|
| 1012 |
- iniset $Q_DHCP_CONF_FILE DEFAULT verbose True |
|
| 1013 | 1012 |
iniset $Q_DHCP_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
| 1014 | 1013 |
iniset $Q_DHCP_CONF_FILE AGENT root_helper "$Q_RR_COMMAND" |
| 1015 | 1014 |
if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then |
| ... | ... |
@@ -1041,7 +1039,6 @@ function _configure_neutron_l3_agent {
|
| 1041 | 1041 |
|
| 1042 | 1042 |
cp $NEUTRON_DIR/etc/l3_agent.ini.sample $Q_L3_CONF_FILE |
| 1043 | 1043 |
|
| 1044 |
- iniset $Q_L3_CONF_FILE DEFAULT verbose True |
|
| 1045 | 1044 |
iniset $Q_L3_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
| 1046 | 1045 |
iniset $Q_L3_CONF_FILE AGENT root_helper "$Q_RR_COMMAND" |
| 1047 | 1046 |
if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then |
| ... | ... |
@@ -1062,7 +1059,6 @@ function _configure_neutron_l3_agent {
|
| 1062 | 1062 |
function _configure_neutron_metadata_agent {
|
| 1063 | 1063 |
cp $NEUTRON_DIR/etc/metadata_agent.ini.sample $Q_META_CONF_FILE |
| 1064 | 1064 |
|
| 1065 |
- iniset $Q_META_CONF_FILE DEFAULT verbose True |
|
| 1066 | 1065 |
iniset $Q_META_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
| 1067 | 1066 |
iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP |
| 1068 | 1067 |
iniset $Q_META_CONF_FILE AGENT root_helper "$Q_RR_COMMAND" |
| ... | ... |
@@ -1126,7 +1122,6 @@ function _configure_neutron_plugin_agent {
|
| 1126 | 1126 |
if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then |
| 1127 | 1127 |
iniset /$Q_PLUGIN_CONF_FILE agent root_helper_daemon "$Q_RR_DAEMON_COMMAND" |
| 1128 | 1128 |
fi |
| 1129 |
- iniset $NEUTRON_CONF DEFAULT verbose True |
|
| 1130 | 1129 |
iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
| 1131 | 1130 |
|
| 1132 | 1131 |
# Configure agent for plugin |
| ... | ... |
@@ -1146,7 +1141,6 @@ function _configure_neutron_service {
|
| 1146 | 1146 |
iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES |
| 1147 | 1147 |
fi |
| 1148 | 1148 |
|
| 1149 |
- iniset $NEUTRON_CONF DEFAULT verbose True |
|
| 1150 | 1149 |
iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
| 1151 | 1150 |
iniset $NEUTRON_CONF oslo_policy policy_file $Q_POLICY_FILE |
| 1152 | 1151 |
iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP |