From 93df2483c6adf25de97413b0371c72e4e998aa3e Mon Sep 17 00:00:00 2001
From: Wanlong Gao <wanlong.gao@easystack.cn>
Date: Sat, 16 Jan 2016 20:28:31 +0800
Subject: [PATCH] Replace the deprecated rsyslog config style

The old style has been deprecated for time:
http://www.rsyslog.com/doc/v8-stable/compatibility/v7compatibility.html#omruleset-and-discard-action-are-deprecated
TrivialFix

Change-Id: I70fa065f5fbd686ddb8f4134bb93c08c7af00365
---
 ansible/roles/common/templates/rsyslog.conf.j2 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index c1334d0eee..280ff5ba94 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
+}