From 4d341f4cb3d7ba8c3852ed6c01cf6e96310e7bd9 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Wed, 12 Apr 2017 15:20:56 -0700
Subject: [PATCH] Deprecate watch_log= argument for Daemon

It's no longer used now that we switched to haproxy for metadata proxy.
There are also no consumers outside the tree, as codesearch.* inspection
suggests. We should be safe to kill the argument, but for the sake of
safety, follow deprecation process.

Change-Id: I53fe014e80b507acf77a3c109179685e2e50200c
---
 neutron/agent/linux/daemon.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/neutron/agent/linux/daemon.py b/neutron/agent/linux/daemon.py
index 6ad9ee3c8b4..8f5e4a7ca9f 100644
--- a/neutron/agent/linux/daemon.py
+++ b/neutron/agent/linux/daemon.py
@@ -22,6 +22,7 @@ import pwd
 import signal
 import sys
 
+from debtcollector import removals
 from oslo_log import log as logging
 
 from neutron._i18n import _, _LE, _LI
@@ -167,6 +168,9 @@ class Daemon(object):
 
     Usage: subclass the Daemon class and override the run() method
     """
+    @removals.removed_kwarg(
+        'watch_log',
+        message="Support for watch_log argument will be removed in Queens.")
     def __init__(self, pidfile, stdin=DEVNULL, stdout=DEVNULL,
                  stderr=DEVNULL, procname='python', uuid=None,
                  user=None, group=None, watch_log=True):