garethgreenaway

19:54:34,701 [salt.state                                 :2240][INFO    ] === requisite [OrderedDict([('sls', 'requisites.fullsls_require_import2')])] ===
19:54:34,701 [salt.state                                 :2241][INFO    ] === chunks [{'fun': 'run', 'state': 'cmd', '__env__': 'base', '__sls__': 'requisites.fullsls_test', 'name': 'echo B', '__id__': 'B', 'order': 10000}, {'fun': 'run', 'state': 'cmd', '__env__': 'base', '__sls__': 'requisites.fullsls_test', 'name': 'echo C', '__id__': 'C', 'order': 10001}, {'fun': 'succeed_without_changes', 'state': 'test', '__env__': 'base', '__sls__': 'requisites.fullsls_require_import', 'order': 10002, 'name': 'A', '__id__': 'A', 'require': [OrderedDict([('sls', 'requisites.fullsls_require_import2')])]}] ===
19:54:34,703 [salt.state                                 :2243][INFO    ] === Running for req OrderedDict([('sls', 'requisites.fullsls_require_import2')]) ===
19:54:34,703 [salt.state                                 :2251][INFO    ] === Running for chunk {'fun': '

garethgreenaway

Hi Gareth,

My name is Zander and I'm with Hopsy, a San Francisco based craft beer startup that delivers small-batch microbrew from specialty breweries straight to you. We now service the entire West Coast!

Our new device called The Sub - a mobile beer tap that offers a rotating selection of fresh craft beer at your fingertips via Torps - is great for a 5 o'clock pour or an impromptu office celebration!

This month we are offering a brand new Trial Program where we will send your office 2 SUBs ($150 each) for a two-week trial absolutely free of charge. All you need to do is buy a couple Torps to fill your SUBs and voila - fresh draft beer on tap in the office!

After your Sub Trial period, you can either buy the SUBs and order Torps at your leisure, or just send the SUBs back to us (we’ll take care of shipping too!)

garethgreenaway

Cythonizing /root/raas/raas/contracts/rpc/typecheck.py

Error compiling Cython file:
------------------------------------------------------------
...
                    )
    if errors:
        raise RPCInvalidParameters(RPCErrors.INVALID_PARAMS.MESSAGE, detail=errors)

garethgreenaway

# Sphinx version: 1.6.5
# Python version: 2.7.14 (CPython)
# Docutils version: 0.14 
# Jinja2 version: 2.10
# Last messages:

# Loaded extensions:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/sphinx/cmdline.py", line 305, in main
    opts.warningiserror, opts.tags, opts.verbosity, opts.jobs)

garethgreenaway

salt/presence/change    {
    "_stamp": "2018-01-03T17:12:48.114366",
    "lost": [
        "minion2"
    ],
    "new": []
}
salt/presence/present   {
    "_stamp": "2018-01-03T17:12:48.115233",
    "present": [

garethgreenaway

salt/presence/change    {
    "_stamp": "2018-01-03T17:12:48.114366",
    "lost": [
        "minion2"
    ],
    "new": []
}
salt/presence/present   {
    "_stamp": "2018-01-03T17:12:48.115233",
    "present": [

garethgreenaway

salt/presence/change    {
    "_stamp": "2018-01-03T17:12:48.114366",
    "lost": [
        "minion2"
    ],
    "new": []
}
salt/presence/present   {
    "_stamp": "2018-01-03T17:12:48.115233",
    "present": [

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']:

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/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():