summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-28 14:50:03 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-28 20:23:26 +0400
commit4003dfc1ff62edc587f83aa54cd9eb3fd0347635 (patch)
treedb7c59ebfb5350d519a2bf5a221d2ec01e1ab4fe /mcp/patches
parent08bb570b39b123c5a5adf70e34e05bb43a6e3387 (diff)
Sync os cacert from proxy to salt master
JIRA: FUEL-274 Change-Id: I2c8161b24cb18a0d1f9dc6fd509ce18af7ea8cf5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/0008-Handle-file_recv-option.patch18
-rw-r--r--mcp/patches/patches.list1
2 files changed, 19 insertions, 0 deletions
diff --git a/mcp/patches/0008-Handle-file_recv-option.patch b/mcp/patches/0008-Handle-file_recv-option.patch
new file mode 100644
index 000000000..0c76449f7
--- /dev/null
+++ b/mcp/patches/0008-Handle-file_recv-option.patch
@@ -0,0 +1,18 @@
+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
+ -#}
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index 1a651cfe0..419ff261c 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -5,3 +5,4 @@
/usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch
/usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch
/usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch
+/usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch