aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2014-10-10 15:01:56 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2014-10-13 16:43:13 -0400
commit8313834d169fb20807385850b1c004220abd6609 (patch)
tree3eaf976d8b64e59077d9aa7557b018441769153b /docker
parent282345c12e44194b73674464a98e207b396a9294 (diff)
downloadkolla-8313834d169fb20807385850b1c004220abd6609.tar.gz
kolla-8313834d169fb20807385850b1c004220abd6609.zip
log to stdout/stderr
modify glance and keystone images to log to stdout/stderr, so that logs can be recovered using "docker logs". Change-Id: I18470c13142ceaf2f10c32e10f5e835ddaf58550
Diffstat (limited to 'docker')
-rw-r--r--docker/glance/glance-base/config-glance.sh5
-rwxr-xr-xdocker/keystone/start.sh5
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh
index b260ed7e9..990788813 100644
--- a/docker/glance/glance-base/config-glance.sh
+++ b/docker/glance/glance-base/config-glance.sh
@@ -22,9 +22,10 @@ export OS_TENANT_NAME="${ADMIN_TENANT_NAME}"
EOF
for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do
- crudini --del $cfg \
+ crudini --set $cfg \
DEFAULT \
- log_file
+ log_file \
+ ""
for option in auth_protocol auth_host auth_port; do
crudini --del $cfg \
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index fc01db694..d7e494f83 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -25,9 +25,10 @@ crudini --set /etc/keystone/keystone.conf \
DEFAULT \
admin_token \
"${KEYSTONE_ADMIN_TOKEN}"
-crudini --del /etc/keystone/keystone.conf \
+crudini --set /etc/keystone/keystone.conf \
DEFAULT \
- log_file
+ log_file \
+ ""
crudini --del /etc/keystone/keystone.conf \
DEFAULT \
log_dir