Merge branch 'master' into 2019_2_1_port_51785

doc/ref/modules/all/index.rst

@@ -199,6 +199,7 @@ execution modules
     jboss7
     jboss7_cli
     jenkinsmod
+    jinja
     jira_mod
     junos
     k8s

doc/ref/modules/all/salt.modules.jinja.rst

@@ -0,0 +1,6 @@
+==================
+salt.modules.jinja
+==================
+
+.. automodule:: salt.modules.jinja
+    :members:

doc/topics/proxyminion/beacon.rst

@@ -22,15 +22,13 @@ configuring and managing multiple ``salt-proxy`` processes.
        - p8000
 
 This says that Salt's pillar should load some values for the proxy ``p8000``
-from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
+from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
 
-2. In the pillar root for your base environment, create this file:
+2. In the pillar root for your base environment, create the ``p8000.sls`` file with the
+   following contents: 
 
 .. code-block:: yaml
 
-   p8000.sls
-   ---------
-
    proxy:
      # set proxytype for your proxymodule
      proxytype: ssh_sample

doc/topics/proxyminion/demo.rst

@@ -58,16 +58,14 @@ Now, configure your salt-proxy.
 
 
 This says that Salt's pillar should load some values for the proxy ``p8000``
-from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
+from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
 
-3. In the pillar root for your base environment, create this file:
+3. In the pillar root for your base environment, create the ``p8000.sls`` file with the
+   following contents:
 
 
 .. code-block:: yaml
 
-   p8000.sls
-   ---------
-
    proxy:
      proxytype: rest_sample
      url: http://<IP your REST listens on>:port

doc/topics/proxyminion/ssh.rst

@@ -35,16 +35,14 @@ Now, configure your salt-proxy.
 
 
 This says that Salt's pillar should load some values for the proxy ``p8000``
-from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
+from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
 
-3. In the pillar root for your base environment, create this file:
+3. In the pillar root for your base environment, create the ``p8000.sls`` file with the
+   following contents: 
 
 
 .. code-block:: yaml
 
-   p8000.sls
-   ---------
-
    proxy:
      proxytype: ssh_sample
      host: saltyVM

doc/topics/proxyminion/state.rst

@@ -23,15 +23,13 @@ on the remote end.
        - p8000
 
 This says that Salt's pillar should load some values for the proxy ``p8000``
-from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
+from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
 
-2. In the pillar root for your base environment, create this file:
+2. In the pillar root for your base environment, create the ``p8000.sls`` file with the
+   following contents:
 
 .. code-block:: yaml
 
-   p8000.sls
-   ---------
-
    proxy:
      # set proxytype for your proxymodule
      proxytype: ssh_sample

doc/topics/releases/neon.rst

@@ -52,6 +52,34 @@ as well as managing keystore files.
             Hn+GmxZA
             -----END CERTIFICATE-----
 
+
+Troubleshooting Jinja map files
+===============================
+
+A new :py:func:`execution module <salt.modules.jinja>` for ``map.jinja`` troubleshooting
+has been added.
+
+Assuming the map is loaded in your formula SLS as follows:
+
+.. code-block:: jinja
+
+  {% from "myformula/map.jinja" import myformula with context %}
+
+The following command can be used to load the map and check the results:
+
+.. code-block:: bash
+
+  salt myminion jinja.load_map myformula/map.jinja myformula
+
+The module can be also used to test ``json`` and ``yaml`` maps:
+
+.. code-block:: bash
+
+  salt myminion jinja.import_yaml myformula/defaults.yaml
+
+  salt myminion jinja.import_json myformula/defaults.json
+
+
 Slot Syntax Updates
 ===================
 

noxfile.py

@@ -877,13 +877,22 @@ def _pytest(session, coverage, cmd_args):
         else:
             session.run('py.test', *cmd_args, env=env)
     except CommandFailed:
+        # Not rerunning failed tests for now
+        raise
+
+        # pylint: disable=unreachable
         # Re-run failed tests
         session.log('Re-running failed tests')
+
+        for idx, parg in enumerate(cmd_args):
+            if parg.startswith('--junitxml='):
+                cmd_args[idx] = parg.replace('.xml', '-rerun-failed.xml')
         cmd_args.append('--lf')
         if coverage is True:
             _run_with_coverage(session, 'coverage', 'run', '-m', 'py.test', *cmd_args)
         else:
             session.run('py.test', *cmd_args, env=env)
+        # pylint: enable=unreachable
 
 
 def _lint(session, rcfile, flags, paths):

pytest.ini

@@ -0,0 +1,5 @@
+[pytest]
+log_print=false
+log_date_format=%H:%M:%S
+log_cli_format=%(asctime)s,%(msecs)03.0f [%(name)-5s:%(lineno)-4d][%(levelname)-8s][%(processName)s(%(process)s)] %(message)s
+log_file_format=%(asctime)s,%(msecs)03d [%(name)-17s:%(lineno)-4d][%(levelname)-8s][%(processName)s(%(process)d)] %(message)s

requirements/pytest.txt

@@ -1,6 +1,6 @@
 # PyTest
 pytest >=4.6.6,<4.7   # PyTest 4.6.x are the last Py2 and Py3 releases
-pytest-salt >= 2019.11.27
+pytest-salt >= 2019.12.18
 pytest-tempdir >= 2019.10.12
 pytest-helpers-namespace >= 2019.1.8
 pytest-salt-runtests-bridge >= 2019.7.10

requirements/static/darwin.in

@@ -27,3 +27,9 @@ supervisor==3.3.5; python_version < '3'
 virtualenv
 watchdog
 yamlordereddictloader
+
+# Available template libraries that can be used
+Genshi
+Cheetah3==3.1.0
+Mako
+wempy; python_version <'3'

requirements/static/linux.in

@@ -41,3 +41,9 @@ timelib
 tornado<5.0
 virtualenv
 watchdog
+
+# Available template libraries that can be used
+Genshi
+Cheetah3==3.1.0
+Mako
+wempy; python_version <'3'

requirements/static/py2.7/darwin.txt

@@ -90,7 +90,7 @@ pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
-pytest-salt==2019.11.27
+pytest-salt==2019.12.18
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0
@@ -134,3 +134,5 @@ zc.lockfile==1.4          # via cherrypy
 zipp==0.6.0               # via importlib-metadata
 # Passthrough dependencies from pkg/osx/req.txt
 pyobjc==5.1.2
+# Passthrough dependencies from pkg/osx/req.txt
+pyobjc==5.1.2

requirements/static/py2.7/linux.txt

@@ -88,7 +88,7 @@ pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
-pytest-salt==2019.11.27
+pytest-salt==2019.12.18
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto

requirements/static/py2.7/windows.txt

@@ -86,7 +86,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
-pytest-salt==2019.11.27
+pytest-salt==2019.12.18
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0

requirements/static/py3.4/linux.txt

@@ -10,9 +10,8 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
+backports.ssl-match-hostname==3.7.0.1  # via docker
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
@@ -21,6 +20,7 @@ cachetools==3.1.0         # via google-auth
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4            # via requests
+cheetah3==3.1.0
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
 contextlib2==0.5.5        # via cherrypy
@@ -32,6 +32,7 @@ docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.3             # via python-jose
 future==0.17.1            # via python-jose
+genshi==0.7.3
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
@@ -51,6 +52,7 @@ kazoo==2.6.1
 keyring==5.7.1
 kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
+mako==1.1.0
 markupsafe==1.1.1
 mock==3.0.5 ; python_version < "3.6"
 more-itertools==5.0.0
@@ -79,7 +81,7 @@ pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
-pytest-salt==2019.11.27
+pytest-salt==2019.12.18
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
@@ -101,8 +103,7 @@ scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.5/darwin.txt

@@ -10,9 +10,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-backports-abc==0.5
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl_match_hostname==3.7.0.1
+backports_abc==0.5
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
@@ -21,6 +21,7 @@ cachetools==3.1.0         # via google-auth
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4            # via requests
+cheetah3==3.1.0
 cheroot==6.5.5            # via cherrypy
 cherrypy==17.4.1
 click==7.0
@@ -35,6 +36,7 @@ docutils==0.14            # via botocore
 ecdsa==0.13.3             # via python-jose
 enum34==1.1.6
 future==0.17.1            # via python-jose
+genshi==0.7.3
 gitdb2==2.0.5             # via gitpython
 gitdb==0.6.4
 gitpython==2.1.11
@@ -82,7 +84,7 @@ pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
-pytest-salt==2019.11.27
+pytest-salt==2019.12.18
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0

requirements/static/py3.5/linux.txt

@@ -10,9 +10,7 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
@@ -21,6 +19,7 @@ cachetools==3.1.0         # via google-auth
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4            # via requests
+cheetah3==3.1.0
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
 contextlib2==0.5.5        # via cherrypy
@@ -32,6 +31,7 @@ docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.3             # via python-jose
 future==0.17.1            # via python-jose
+genshi==0.7.3
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
@@ -51,6 +51,7 @@ kazoo==2.6.1
 keyring==5.7.1
 kubernetes==3.0.0
 lxml==4.3.3               # via junos-eznc, ncclient
+mako==1.1.0
 markupsafe==1.1.1
 mock==3.0.5 ; python_version < "3.6"
 more-itertools==5.0.0
@@ -79,7 +80,7 @@ pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
-pytest-salt==2019.11.27
+pytest-salt==2019.12.18
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
@@ -99,8 +100,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.5/windows.txt

@@ -19,6 +19,7 @@ cachetools==3.1.0         # via google-auth
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4            # via requests
+cheetah3==3.1.0
 cheroot==6.5.5            # via cherrypy
 cherrypy==17.4.1
 colorama==0.4.1           # via pytest
@@ -32,6 +33,7 @@ docutils==0.14            # via botocore
 ecdsa==0.13.3             # via python-jose
 enum34==1.1.6
 future==0.17.1            # via python-jose
+genshi==0.7.3
 gitdb2==2.0.5             # via gitpython
 gitdb==0.6.4
 gitpython==2.1.10
@@ -78,7 +80,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
 pytest-salt-runtests-bridge==2019.7.10
-pytest-salt==2019.11.27
+pytest-salt==2019.12.18
 pytest-tempdir==2019.10.12
 pytest==4.6.6
 python-dateutil==2.8.0