Merge pull request #47900 from rallytime/merge-2018.3.1-to-2018.3

[2018.3] Merge forward from 2018.3.1 to 2018.3

doc/topics/releases/2017.7.6.rst

@@ -5,6 +5,16 @@ In Progress: Salt 2017.7.6 Release Notes
 Version 2017.7.6 is an **unreleased** bugfix release for :ref:`2017.7.0 <release-2017-7-0>`.
 This release is still in progress and has not been released yet.
 
+Tornado 5.0 Support for Python 2 Only
+-------------------------------------
+
+Tornado 5.0 moves to using asyncio for all python3 versions.  Because of this
+and changes in asyncio between python 3.4 and 3.5 to only be able to use one
+ioloop, which requires some rearchitecting, support for tornado 5.0 and python3
+versions of salt has been delayed to a later release.
+
+For now, to use tornado 5.0, the python 2 version of salt must be used.
+
 Option to Return to Previous Pillar Include Behavior
 ----------------------------------------------------
 

requirements/base.txt

@@ -5,6 +5,8 @@ msgpack>=0.5,!=0.5.5
 PyYAML
 MarkupSafe
 requests>=1.0.0
-tornado>=4.2.1,<6.0
+tornado>=4.2.1,<6.0; python_version < '3'
+tornado>=4.2.1,<5.0; python_version >= '3.4'
+
 # Required by Tornado to handle threads stuff.
 futures>=2.0; python_version < '3.0'

salt/modules/mac_system.py

@@ -74,8 +74,7 @@ def _atrun_enabled():
         # Collect information on service: will raise an error if it fails
         salt.utils.mac_utils.launchctl('list',
                                        label,
-                                       return_stdout=True,
-                                       output_loglevel='quiet')
+                                       return_stdout=True)
         return True
     except CommandExecutionError:
         return False
@@ -111,9 +110,8 @@ def _enable_atrun():
         return False
 
     salt.utils.mac_utils.launchctl('enable',
-                                   'system/{0}'.format(label),
-                                   output_loglevel='quiet')
-    salt.utils.mac_utils.launchctl('load', path, output_loglevel='quiet')
+                                   'system/{0}'.format(label))
+    salt.utils.mac_utils.launchctl('load', path)
     return _atrun_enabled()
 
 

salt/modules/win_lgpo.py

@@ -35,7 +35,7 @@ Current known limitations
   - lxml
   - uuid
   - struct
-  - salt.modules.reg
+  - salt.utils.win_reg
 '''
 # Import Python libs
 from __future__ import absolute_import, unicode_literals, print_function
@@ -98,7 +98,7 @@ try:
     import lxml
     import struct
     from lxml import etree
-    from salt.modules.reg import Registry as Registry
+    from salt.utils.win_reg import Registry
     HAS_WINDOWS_MODULES = True
     TRUE_VALUE_XPATH = etree.XPath('.//*[local-name() = "trueValue"]')
     FALSE_VALUE_XPATH = etree.XPath('.//*[local-name() = "falseValue"]')
@@ -2672,9 +2672,11 @@ def __virtual__():
     '''
     Only works on Windows systems
     '''
-    if salt.utils.platform.is_windows() and HAS_WINDOWS_MODULES:
-        return __virtualname__
-    return False
+    if not salt.utils.platform.is_windows():
+        return False, 'win_lgpo: Not a Windows System'
+    if not HAS_WINDOWS_MODULES:
+        return False, 'win_lgpo: Required modules failed to load'
+    return __virtualname__
 
 
 def _updateNamespace(item, new_namespace):
@@ -5372,7 +5374,7 @@ def set_(computer_policy=None, user_policy=None,
                         else:
                             raise SaltInvocationError(msg)
                         if policy_namespace and policy_name in _admTemplateData[policy_namespace] and the_policy is not None:
-                            log.debug('setting == %s', _admTemplateData[policy_namespace][policy_name].lower())
+                            log.debug('setting == %s', six.text_type(_admTemplateData[policy_namespace][policy_name]).lower())
                             log.debug(six.text_type(_admTemplateData[policy_namespace][policy_name]).lower())
                             if six.text_type(_admTemplateData[policy_namespace][policy_name]).lower() != 'disabled' \
                                     and six.text_type(_admTemplateData[policy_namespace][policy_name]).lower() != 'not configured':