From 6f4880a25826ac5df3f20875df27ae7852ec440f Mon Sep 17 00:00:00 2001
From: Rob Ruma <robruma@gmail.com>
Date: Fri, 14 Oct 2016 08:25:18 -0400
Subject: [PATCH] Adding support for master_id option documented in
 https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id

---
 salt/files/master.d/f_defaults.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 7918fb8..0a6093d 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -21,6 +21,12 @@
 # after the comment then the value is presented as an example and is not the
 # default.
 
+# The id to be passed in the publish job to minions.
+# This is used for MultiSyndics to return the job to the requesting master.
+# This must be the same string as the syndic is configured with.
+# master_id: None
+{{ get_config('master_id', 'None') }}
+
 # Per default, the master will automatically include all config files
 # from master.d/*.conf (master.d is a directory in the same directory
 # as the main master config file).