Browse code

Neutron: enable setting debug as True or False

The flag ENABLE_DEBUG_LOG_LEVEL indicates if this should be
set or not.

This will now be supported in Neutron.

Change-Id: I3afe0546b379873247fee1ef9f4cc2708a7b5713

Gary Kotton authored on 2016/09/20 20:12:11
Showing 1 changed files
... ...
@@ -126,7 +126,7 @@ 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
129
+    iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
130 130
 
131 131
     iniset_rpc_backend neutron $NEUTRON_CONF
132 132
 
... ...
@@ -172,7 +172,7 @@ function configure_neutron_new {
172 172
     # Neutron OVS or LB agent
173 173
     if is_service_enabled neutron-agent; then
174 174
         iniset $NEUTRON_PLUGIN_CONF agent tunnel_types vxlan
175
-        iniset $NEUTRON_PLUGIN_CONF DEFAULT debug True
175
+        iniset $NEUTRON_PLUGIN_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
176 176
 
177 177
         # Configure the neutron agent
178 178
         if [[ $NEUTRON_AGENT == "linuxbridge" ]]; then
... ...
@@ -188,7 +188,7 @@ function configure_neutron_new {
188 188
     if is_service_enabled neutron-dhcp; then
189 189
         cp $NEUTRON_DIR/etc/dhcp_agent.ini.sample $NEUTRON_DHCP_CONF
190 190
 
191
-        iniset $NEUTRON_DHCP_CONF DEFAULT debug True
191
+        iniset $NEUTRON_DHCP_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
192 192
         # make it so we have working DNS from guests
193 193
         iniset $NEUTRON_DHCP_CONF DEFAULT dnsmasq_local_resolv True
194 194
 
... ...
@@ -202,7 +202,7 @@ function configure_neutron_new {
202 202
         iniset $NEUTRON_L3_CONF DEFAULT interface_driver $NEUTRON_AGENT
203 203
         iniset $NEUTRON_CONF DEFAULT service_plugins router
204 204
         iniset $NEUTRON_L3_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"
205
-        iniset $NEUTRON_L3_CONF DEFAULT debug True
205
+        iniset $NEUTRON_L3_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
206 206
         neutron_plugin_configure_l3_agent $NEUTRON_L3_CONF
207 207
     fi
208 208
 
... ...
@@ -210,7 +210,7 @@ function configure_neutron_new {
210 210
     if is_service_enabled neutron-metadata-agent; then
211 211
         cp $NEUTRON_DIR/etc/metadata_agent.ini.sample $NEUTRON_META_CONF
212 212
 
213
-        iniset $NEUTRON_META_CONF DEFAULT debug True
213
+        iniset $NEUTRON_META_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
214 214
         iniset $NEUTRON_META_CONF DEFAULT nova_metadata_ip $SERVICE_HOST
215 215
         iniset $NEUTRON_META_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"
216 216