aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-base
diff options
context:
space:
mode:
authorDaneyon Hansen <danehans@cisco.com>2015-04-01 18:38:46 +0000
committerDaneyon Hansen <danehans@cisco.com>2015-04-07 19:13:29 +0000
commit0b671ad58d31dc3c3704a35a9ef0c17af0834e72 (patch)
tree726964e5a0810383b908c0413943702a998e916d /docker/nova-base
parent5ea37557cf1d5600e0bb141e010a4bcdbd967162 (diff)
downloadkolla-0b671ad58d31dc3c3704a35a9ef0c17af0834e72.tar.gz
kolla-0b671ad58d31dc3c3704a35a9ef0c17af0834e72.zip
Adds Initial Logging Support
Previously, logging was hard coded into the nova and neutron containers. This patch creates two common params for logging: DEBUG_LOGGING VERBOSE_LOGGING and sets default values of verbose=true and debug=false. This patch implements logging for Nova and Neutron. Add'l OS service config scripts and images will need to be updated to use the logging params. Change-Id: I03d48005d5b4789aa3c519879a20d963ef1cbaa3
Diffstat (limited to 'docker/nova-base')
-rwxr-xr-xdocker/nova-base/config-nova.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh
index 0764964d5..6350ed695 100755
--- a/docker/nova-base/config-nova.sh
+++ b/docker/nova-base/config-nova.sh
@@ -18,7 +18,8 @@
check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \
RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \
KEYSTONE_PUBLIC_SERVICE_HOST PUBLIC_IP \
- PUBLIC_INTERFACE FLAT_INTERFACE
+ PUBLIC_INTERFACE FLAT_INTERFACE DEBUG_LOGGING \
+ VERBOSE_LOGGING NOVA_LOG_DIR
cfg=/etc/nova/nova.conf
@@ -60,10 +61,11 @@ crudini --set $cfg DEFAULT volume_api_class nova.volume.cinder.API
crudini --set $cfg DEFAULT image_service nova.image.glance.GlanceImageService
crudini --set $cfg DEFAULT osapi_volume_listen 0.0.0.0
-# configure logging to stderr
-crudini --del $cfg DEFAULT log_dir
-crudini --set $cfg DEFAULT log_file ""
-crudini --set $cfg DEFAULT use_stderr True
+# configure logging
+crudini --set $cfg DEFAULT log_dir "${NOVA_LOG_DIR}"
+crudini --set $cfg DEFAULT debug "${DEBUG_LOGGING}"
+crudini --set $cfg DEFAULT verbose "${VERBOSE_LOGGING}"
+
crudini --set $cfg DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}"
crudini --set $cfg conductor workers 8