Browse code

Neutron: Remove verbose and always set debug to true

http://lists.openstack.org/pipermail/openstack-dev/2016-May/095166.html

Change-Id: I7c51518c10d96eb84a6ddd2514011bfd42623d5d

Sean M. Collins authored on 2016/05/13 00:17:53
Showing 1 changed files
... ...
@@ -126,6 +126,8 @@ function configure_neutron_new {
126 126
     iniset $NEUTRON_CONF oslo_concurrency lock_path $NEUTRON_STATE_PATH/lock
127 127
     iniset $NEUTRON_CONF DEFAULT use_syslog $SYSLOG
128 128
 
129
+    iniset $NEUTRON_CONF DEFAULT debug True
130
+
129 131
     iniset_rpc_backend neutron $NEUTRON_CONF
130 132
 
131 133
     # Neutron API server & Neutron plugin
... ...
@@ -139,8 +141,6 @@ function configure_neutron_new {
139 139
 
140 140
         iniset $NEUTRON_CONF DEFAULT core_plugin ml2
141 141
 
142
-        iniset $NEUTRON_CONF DEFAULT verbose True
143
-        iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
144 142
         iniset $NEUTRON_CONF DEFAULT policy_file $policy_file
145 143
         iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips True
146 144
 
... ...
@@ -171,6 +171,7 @@ function configure_neutron_new {
171 171
     # Neutron OVS or LB agent
172 172
     if is_service_enabled neutron-agent; then
173 173
         iniset $NEUTRON_PLUGIN_CONF agent tunnel_types vxlan
174
+        iniset $NEUTRON_PLUGIN_CONF DEFAULT debug True
174 175
 
175 176
         # Configure the neutron agent
176 177
         if [[ $NEUTRON_AGENT == "linuxbridge" ]]; then
... ...
@@ -186,7 +187,6 @@ function configure_neutron_new {
186 186
     if is_service_enabled neutron-dhcp; then
187 187
         cp $NEUTRON_DIR/etc/dhcp_agent.ini.sample $NEUTRON_DHCP_CONF
188 188
 
189
-        iniset $NEUTRON_DHCP_CONF DEFAULT verbose True
190 189
         iniset $NEUTRON_DHCP_CONF DEFAULT debug True
191 190
         iniset $NEUTRON_DHCP_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"
192 191
         iniset $NEUTRON_DHCP_CONF DEFAULT interface_driver $NEUTRON_AGENT
... ...
@@ -199,7 +199,6 @@ function configure_neutron_new {
199 199
         iniset $NEUTRON_CONF DEFAULT service_plugins router
200 200
         iniset $NEUTRON_L3_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"
201 201
         iniset $NEUTRON_L3_CONF DEFAULT debug True
202
-        iniset $NEUTRON_L3_CONF DEFAULT verbose True
203 202
         neutron_plugin_configure_l3_agent $NEUTRON_L3_CONF
204 203
     fi
205 204
 
... ...
@@ -207,8 +206,7 @@ function configure_neutron_new {
207 207
     if is_service_enabled neutron-metadata-agent; then
208 208
         cp $NEUTRON_DIR/etc/metadata_agent.ini.sample $NEUTRON_META_CONF
209 209
 
210
-        iniset $NEUTRON_META_CONF DEFAULT verbose True
211
-        iniset $NEUTRON_META_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
210
+        iniset $NEUTRON_META_CONF DEFAULT debug True
212 211
         iniset $NEUTRON_META_CONF DEFAULT nova_metadata_ip $SERVICE_HOST
213 212
         iniset $NEUTRON_META_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"
214 213