aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron/agents
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/neutron/agents
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/neutron/agents')
-rwxr-xr-xdocker/neutron/agents/dhcp/start.sh9
-rwxr-xr-xdocker/neutron/agents/l3/start.sh9
-rwxr-xr-xdocker/neutron/agents/linux-bridge/start.sh9
-rwxr-xr-xdocker/neutron/agents/metadata/start.sh10
4 files changed, 33 insertions, 4 deletions
diff --git a/docker/neutron/agents/dhcp/start.sh b/docker/neutron/agents/dhcp/start.sh
index 7754532a6..70c846526 100755
--- a/docker/neutron/agents/dhcp/start.sh
+++ b/docker/neutron/agents/dhcp/start.sh
@@ -9,9 +9,16 @@ set -e
: ${DHCP_DRIVER:=neutron.agent.linux.dhcp.Dnsmasq}
: ${USE_NAMESPACES:=false}
-check_required_vars VERBOSE_LOGGING DEBUG_LOGGING
+check_required_vars VERBOSE_LOGGING DEBUG_LOGGING NEUTRON_DHCP_AGENT_LOG_FILE
cfg=/etc/neutron/dhcp_agent.ini
+neutron_conf=/etc/neutron/neutron.conf
+
+# Logging
+crudini --set $neutron_conf \
+ DEFAULT \
+ log_file \
+ "${NEUTRON_DHCP_AGENT_LOG_FILE}"
# Configure dhcp_agent.ini
crudini --set $cfg \
diff --git a/docker/neutron/agents/l3/start.sh b/docker/neutron/agents/l3/start.sh
index 17a09ad65..0ad112165 100755
--- a/docker/neutron/agents/l3/start.sh
+++ b/docker/neutron/agents/l3/start.sh
@@ -8,9 +8,16 @@ set -e
: ${INTERFACE_DRIVER:=neutron.agent.linux.interface.BridgeInterfaceDriver}
: ${USE_NAMESPACES:=false}
-check_required_vars VERBOSE_LOGGING DEBUG_LOGGING
+check_required_vars VERBOSE_LOGGING DEBUG_LOGGING NEUTRON_L3_AGENT_LOG_FILE
cfg=/etc/neutron/l3_agent.ini
+neutron_conf=/etc/neutron/neutron.conf
+
+# Logging
+crudini --set $neutron_conf \
+ DEFAULT \
+ log_file \
+ "${NEUTRON_L3_AGENT_LOG_FILE}"
# Configure l3_agent.ini
crudini --set $cfg \
diff --git a/docker/neutron/agents/linux-bridge/start.sh b/docker/neutron/agents/linux-bridge/start.sh
index 1aeea4cf5..2ff5a05ed 100755
--- a/docker/neutron/agents/linux-bridge/start.sh
+++ b/docker/neutron/agents/linux-bridge/start.sh
@@ -8,9 +8,16 @@ set -e
: ${NEUTRON_FLAT_NETWORK_NAME:=physnet1}
: ${NEUTRON_FLAT_NETWORK_INTERFACE:=eth1}
-check_required_vars PUBLIC_IP
+check_required_vars PUBLIC_IP NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE
cfg=/etc/neutron/plugins/ml2/ml2_conf.ini
+neutron_conf=/etc/neutron/neutron.conf
+
+# Logging
+crudini --set $neutron_conf \
+ DEFAULT \
+ log_file \
+ "${NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE}"
# Configure ml2_conf.ini
crudini --set $cfg \
diff --git a/docker/neutron/agents/metadata/start.sh b/docker/neutron/agents/metadata/start.sh
index 9eef79a31..a99574152 100755
--- a/docker/neutron/agents/metadata/start.sh
+++ b/docker/neutron/agents/metadata/start.sh
@@ -10,9 +10,17 @@ set -e
check_required_vars VERBOSE_LOGGING DEBUG_LOGGING KEYSTONE_AUTH_PROTOCOL \
KEYSTONE_PUBLIC_SERVICE_HOST ADMIN_TENANT_NAME \
NEUTRON_KEYSTONE_USER NEUTRON_KEYSTONE_PASSWORD \
- NEUTRON_SHARED_SECRET NOVA_API_SERVICE_HOST
+ NEUTRON_SHARED_SECRET NOVA_API_SERVICE_HOST \
+ NEUTRON_METADATA_AGENT_LOG_FILE
cfg=/etc/neutron/metadata_agent.ini
+neutron_conf=/etc/neutron/neutron.conf
+
+# Logging
+crudini --set $neutron_conf \
+ DEFAULT \
+ log_file \
+ "${NEUTRON_METADATA_AGENT_LOG_FILE}"
# Configure metadata_agent.ini
crudini --set $cfg \