Also correctly wrap the output of orchestrate with 'data' key
This was put in as a fix for the orchestrate runner in #25521. However,
we just needed to wrap the return in 'data' to get it to be stripped
automatically. The lack of 'outputter' was causing us to not properly
strip the 'data' further down, and the highstate outputter would
subsequently barf.
The implicit call to syslog.openlog will already add salt-minion (technically `sys.argv[0]`) to the syslog.syslog call. It's redundant (and not technically correct) to have salt-minion here.
Can also be applied to 2015.8 and develop without issue.
Fixes#27756
If module named git does not exist, test test_ext_pillar_env_mapping
fail:
======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
import git
ImportError: No module named git
Added skip test_ext_pillar_env_mapping test.
Setup::DownloadWindowsDlls is downloading and writing the file as
a text not a binary file.
When creating the file handle to write the binary after being download from salt's
dependency repo, the file handle was being created with just the 'write' attribute,
however it also needs the 'binary' attribute.
Change-Id: I2f67d27ee847cd7808a78cd5ec0b2151d6a0c0e7
- using get() is anyway more pythonic
- psycopg2 translates None to NULL
- moving explanation to schema comment
(there's no existing unit test for this)
I was getting a "Permission denied" OSError when running as a non-root
user, from the example provided at
https://docs.saltstack.com/en/latest/ref/runners/all/salt.runners.pillar.html#salt.runners.pillar.show_pillar:
import salt.config
import salt.runner
opts = salt.config.master_config('/etc/salt/master')
runner = salt.runner.RunnerClient(opts)
pillar = runner.cmd('pillar.show_pillar')
print(pillar)
This patch passes on the increased `recurse_count` argument, so it will
eventually abort after 5 retries.
