garethgreenaway

diff --git a/salt/log/setup.py b/salt/log/setup.py
index 4c6d5dd8fd..6d74ee0274 100644
--- a/salt/log/setup.py
+++ b/salt/log/setup.py
@@ -48,6 +48,7 @@ from salt.log.handlers import (TemporaryLoggingHandler,
                                QueueHandler)
 from salt.log.mixins import LoggingMixInMeta, NewStyleClassMixIn
 
+from salt.utils.ctx import RequestContext
 

garethgreenaway

## Abstract

Ansible is great at configuration management, but as environments get larger, it needs help scaling to meet demand. 
This is why Ansible Tower was created. However, your organization may not need all the features that Ansible Tower 
offers, you simply need a way to allow your Ansible installation to keep up as your infrastructure grows.

This is where SaltStack can help. SaltStack was designed to be a large scaleable remote execution and orchestration platform,
a flexible devops platform that allows it to work with a number of different systems.  It can do configuration management as
well, but if you've already invested in Ansible, there is no reason to not use it. Allow Salt to help Ansible scale to meet
your needs.

garethgreenaway

[ERROR   ] [18/Jun/2018:10:27:01] ENGINE Error in HTTPServer.tick
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/dist-packages/cheroot/server.py", line 1538, in start
    self.tick()
  File "/usr/local/lib/python2.7/dist-packages/cheroot/server.py", line 1622, in tick
    s, ssl_env = self.ssl_adapter.wrap(s)
  File "/usr/local/lib/python2.7/dist-packages/cheroot/ssl/builtin.py", line 72, in wrap
    sock, do_handshake_on_connect=True, server_side=True,
  File "/usr/lib/python2.7/ssl.py", line 369, in wrap_socket
    _context=self)

garethgreenaway

Traceback (most recent call last):
  File "/home/gareth/code/salt/tests/unit/test_minion.py", line 273, in test_beacons_before_connect
    minion.tune_in(start=True)
  File "/home/gareth/code/salt/salt/minion.py", line 2589, in tune_in
    self.setup_beacons(before_connect=True)
  File "/home/gareth/code/salt/salt/minion.py", line 2512, in setup_beacons
    periodic_cb.start()
  File "/usr/lib/python2.7/dist-packages/tornado/ioloop.py", line 1006, in start
    self._schedule_next()
  File "/usr/lib/python2.7/dist-packages/tornado/ioloop.py", line 1041, in _schedule_next

garethgreenaway

Python2
========
local:
----------
          ID: test
    Function: module.run
        Name: test.echo
      Result: True
     Comment: Module function test.echo executed
     Started: 12:51:46.768254

garethgreenaway

>>>>>> ------Exception-------
>>>>>> Class: Kitchen::UserError
>>>>>> Message: WinRM Transport requires the vagrant-winrm Vagrant plugin to properly communicate with this Vagrant VM. Please install this plugin with: `vagrant plugin install vagrant-winrm' and try again.
>>>>>> ----------------------
>>>>>> Please see .kitchen/logs/kitchen.log for more details
>>>>>> Also try running `kitchen diagnose --all` for configuration

garethgreenaway

set nocompatible
filetype off

set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()

" let Vundle manage Vundle
" required!
Plugin 'VundleVim/Vundle.vim'
Plugin 'saltstack/salt-vim'

garethgreenaway

diff --git a/salt/utils/vault.py b/salt/utils/vault.py
index 0a96fbc1a1..98f71a107e 100644
--- a/salt/utils/vault.py
+++ b/salt/utils/vault.py
@@ -98,7 +98,7 @@ def _get_vault_connection():
     Get the connection details for calling Vault, from local configuration if
     it exists, or from the master otherwise
     '''
-    if 'vault' in __opts__ and __opts__.get('__role', 'minion') == 'master':
+    def _use_local_config():

garethgreenaway

diff --git a/salt/utils/schedule.py b/salt/utils/schedule.py
index ac9a61d26e..616726dc1b 100644
--- a/salt/utils/schedule.py
+++ b/salt/utils/schedule.py
@@ -803,9 +803,6 @@ class Schedule(object):
             if not isinstance(data, dict):
                 log.error('Scheduled job "{0}" should have a dict value, not {1}'.format(job, type(data)))
                 continue
-            # Job is disabled, continue
-            if 'enabled' in data and not data['enabled']:

garethgreenaway

diff --git a/salt/utils/schedule.py b/salt/utils/schedule.py
index ac9a61d26e..e1c63637d3 100644
--- a/salt/utils/schedule.py
+++ b/salt/utils/schedule.py
@@ -803,9 +803,6 @@ class Schedule(object):
             if not isinstance(data, dict):
                 log.error('Scheduled job "{0}" should have a dict value, not {1}'.format(job, type(data)))
                 continue
-            # Job is disabled, continue
-            if 'enabled' in data and not data['enabled']: