Pass grains in minion start event

conf/minion

@@ -548,6 +548,11 @@
 #  - edit.vim
 #  - hyper
 #
+# List of grains to pass in start event when minion starts up:
+#start_event_grains:
+#  - machine_id
+#  - id
+#
 # Top file to execute if startup_states is 'top':
 #top_file: ''
 

doc/ref/configuration/minion.rst

@@ -2066,6 +2066,21 @@ List of states to run when the minion starts up if ``startup_states`` is set to
       - edit.vim
       - hyper
 
+.. conf_minion:: start_event_grains
+
+``start_event_grains``
+----------------------
+
+Default: ``[]``
+
+List of grains to pass in start event when minion starts up.
+
+.. code-block:: yaml
+
+    start_event_grains:
+      - machine_id
+      - id
+
 .. conf_minion:: top_file
 
 ``top_file``

salt/config/__init__.py

@@ -1283,6 +1283,7 @@ def _gather_buffer_space():
     'state_top_saltenv': None,
     'startup_states': '',
     'sls_list': [],
+    'start_event_grains': [],
     'top_file': '',
     'thoriumenv': None,
     'thorium_top': 'top.sls',

salt/minion.py

@@ -1475,6 +1475,11 @@ def _fire_master(self, data=None, tag=None, events=None, pretag=None, timeout=60
         else:
             return
 
+        if self.opts['start_event_grains']:
+            grains_to_add = dict(
+                [(k, v) for k, v in six.iteritems(self.opts.get('grains', {})) if k in self.opts['start_event_grains']])
+            load['grains'] = grains_to_add
+
         if sync:
             try:
                 self._send_req_sync(load, timeout)