blob: b0c497ae12e580d56d9f542f4c7d6ac83b2a3596 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Mon, 28 Aug 2017 16:17:43 +0400
Subject: [PATCH] Handle file_recv option
diff --git a/salt/files/master.conf b/salt/files/master.conf
index 329ae0d..a9d9656 100644
--- a/salt/files/master.conf
+++ b/salt/files/master.conf
@@ -95,6 +95,8 @@ logstash_zmq_handler:
order_masters: True
{%- endif %}
+file_recv: {{ master.get('file_recv', False) }}
+
{#-
vim: syntax=jinja
-#}
|
