diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-04-01 18:38:46 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-04-07 19:13:29 +0000 |
| commit | 0b671ad58d31dc3c3704a35a9ef0c17af0834e72 (patch) | |
| tree | 726964e5a0810383b908c0413943702a998e916d /docker/nova-controller | |
| parent | 5ea37557cf1d5600e0bb141e010a4bcdbd967162 (diff) | |
| download | kolla-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-controller')
| -rwxr-xr-x | docker/nova-controller/nova-api/start.sh | 8 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-conductor/start.sh | 8 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-scheduler/start.sh | 7 |
3 files changed, 20 insertions, 3 deletions
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh index 90cc62976..eab97474c 100755 --- a/docker/nova-controller/nova-api/start.sh +++ b/docker/nova-controller/nova-api/start.sh @@ -7,13 +7,19 @@ set -e check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \ ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \ - NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME + NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME \ + NOVA_API_LOG_FILE fail_unless_os_service_running keystone fail_unless_db $NOVA_DB_NAME export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" +cfg=/etc/nova/nova.conf + +# configure logging +crudini --set $cfg DEFAULT log_file "${NOVA_API_LOG_FILE}" + crux user-create --update \ -n "${NOVA_KEYSTONE_USER}" \ -p "${NOVA_KEYSTONE_PASSWORD}" \ diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh index 599fb0246..a1b5957e8 100755 --- a/docker/nova-controller/nova-conductor/start.sh +++ b/docker/nova-controller/nova-conductor/start.sh @@ -4,9 +4,15 @@ set -e . /opt/kolla/config-nova.sh -check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD +check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD \ + NOVA_CONDUCTOR_LOG_FILE fail_unless_db +cfg=/etc/nova/nova.conf + +# configure logging +crudini --set $cfg DEFAULT log_file "${NOVA_CONDUCTOR_LOG_FILE}" + mysql -h ${MARIADB_SERVICE_HOST} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME}; diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh index 087d477fe..5be5e4e80 100755 --- a/docker/nova-controller/nova-scheduler/start.sh +++ b/docker/nova-controller/nova-scheduler/start.sh @@ -4,7 +4,12 @@ set -e . /opt/kolla/config-nova.sh -check_required_vars NOVA_DB_NAME +check_required_vars NOVA_DB_NAME NOVA_SCHEDULER_LOG_FILE fail_unless_db $NOVA_DB_NAME +cfg=/etc/nova/nova.conf + +# configure logging +crudini --set $cfg DEFAULT log_file "${NOVA_SCHEDULER_LOG_FILE}" + exec /usr/bin/nova-scheduler |