Merge pull request #526 from netmanagers/update-minion-config-environ…

…ment-to-saltenv

fix(minion): update config parameter saltenv

salt/files/minion.d/f_defaults.conf

@@ -575,11 +575,16 @@ schedule:
 # enabled and can be disabled by changing this value to False.
 {{ get_config('clean_dynamic_modules', 'True') }}
 
-# Normally, the minion is not isolated to any single environment on the master
+# Renamed from ``environment`` to ``saltenv``. If ``environment`` is used,
+# ``saltenv`` will take its value. If both are used, ``environment`` will be
+# ignored and ``saltenv`` will be used.
+# Normally the minion is not isolated to any single environment on the master
 # when running states, but the environment can be isolated on the minion side
 # by statically setting it. Remember that the recommended way to manage
 # environments is to isolate via the top file.
+#saltenv: None
 {{ get_config('environment', 'None') }}
+{{ get_config('saltenv', 'None') }}
 #
 # Isolates the pillar environment on the minion side. This functions the same
 # as the environment setting, but for pillar instead of states.