aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-18 21:23:59 +0000
committerGerrit Code Review <review@openstack.org>2016-01-18 21:23:59 +0000
commit9a9dbf481bcecb17c9d821978ab59f7ad220aad6 (patch)
treefd7384e34d17c7aa71fdbdbf03e9b2f0cae8bcb6
parent37bcd509bc512b536f2a377fecb4bb8945a8951c (diff)
parent93df2483c6adf25de97413b0371c72e4e998aa3e (diff)
downloadkolla-9a9dbf481bcecb17c9d821978ab59f7ad220aad6.tar.gz
kolla-9a9dbf481bcecb17c9d821978ab59f7ad220aad6.zip
Merge "Replace the deprecated rsyslog config style"
-rw-r--r--ansible/roles/common/templates/rsyslog.conf.j26
1 files changed, 4 insertions, 2 deletions
diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index c1334d0ee..280ff5ba9 100644
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ b/ansible/roles/common/templates/rsyslog.conf.j2
@@ -140,5 +140,7 @@ $template MagnumConductorFile,"/var/log/magnum/magnum-conductor.log"
:syslogtag,contains,"magnum-conductor" ?MagnumConductorFile
$template DynFile,"/var/log/syslog.log"
-*.* ?DynFile
-& ~
+*.* {
+ ?DynFile
+ stop
+}