aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-23 16:37:56 +0000
committerGerrit Code Review <review@openstack.org>2016-02-23 16:37:56 +0000
commit56c32ac39aed6a7a0cff334e6b57e9e27037499b (patch)
tree9ea99d37921edf409e2dd2cc6282d06d8abf5d23 /tools
parenta431b695606fdbb0d93aa45fa806c972497e61de (diff)
parent0417844b8d1babf3bb95d5237c7811c06d9b6347 (diff)
downloadkolla-56c32ac39aed6a7a0cff334e6b57e9e27037499b.tar.gz
kolla-56c32ac39aed6a7a0cff334e6b57e9e27037499b.zip
Merge "Remove Rsyslog entirely"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/cleanup-containers2
-rwxr-xr-xtools/deploy_aio.sh2
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 2a7a3b910..adf24f450 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -31,7 +31,6 @@ else
nova_{scheduler,novncproxy,consoleauth,conductor,api,compute,libvirt,spicehtml5proxy,compute_ironic} \
openvswitch_{vswitchd,db} \
rabbitmq{,_bootstrap} \
- rsyslog \
heka \
swift_{account_{auditor,reaper,replicator,server},container_{auditor,replicator,server,updater},object_{auditor,expirer,replicator,server,updater},proxy_server,rsyncd}
)
@@ -48,7 +47,6 @@ else
ceph_mon{,_config} \
rabbitmq \
mongodb \
- rsyslog{,_socket} \
haproxy_socket \
heka{,_socket} \
kolla_logs
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index ce53bf6aa..e5c773414 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -9,7 +9,7 @@ export KOLLA_BASE=$1
export KOLLA_TYPE=$2
function copy_logs {
- docker cp rsyslog:/var/log/ /tmp/logs
+ docker cp heka:/var/log/kolla /tmp/logs
}
function check_failure {