Commit Graph

81656 Commits

Author SHA1 Message Date
Mike Place
65f1deefc3 Merge pull request #41017 from cebe/patch-1
Fixed typo in pkg state documentation
2017-05-03 12:00:32 -06:00
Mike Place
31a109172e Merge pull request #41037 from gtmanfred/tops
add extmod whitelist and blacklist to tops
2017-05-03 11:52:01 -06:00
Erik Johnson
ebae1d8fe9 Merge pull request #40985 from ekristen/feature/remote-as-formula
[Feature] Turns a gitfs remote into a true "formula", merges specified branch into current saltenv
2017-05-03 12:17:17 -05:00
Mike Place
a1f83ebb1e Merge pull request #41033 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-03 11:13:42 -06:00
Daniel Wallace
1183b8b557 link vault pillar docs to vault module docs 2017-05-03 11:11:00 -06:00
Nicole Thomas
4eab962e9e Merge pull request #41029 from rallytime/bp-38565
Back-port #38565 to 2016.11
2017-05-03 11:05:09 -06:00
Erik Johnson
effe8b9432 Look for currently-running python's pip first
This improves pip detection on hosts where "pip" exists and refers to a
different Python version from the Python under which Salt is running. It
does so by getting the major and minor version from sys.version_info and
looking for pipX.Y before checking the rest of the potential names for
pip.
2017-05-03 12:04:35 -05:00
Jack Sullivan
57836bbcb4 Fixed crash when lacking file ext
Some tools, like Packer, don't include the 'qcow2' file extension
when generating disk images. When the libvirt cloud module was
given a disk image with no extension, the
function would raise .
This PR fixes the assumption that disk images have file extensions
in their names.
2017-05-03 10:01:37 -07:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
2017-05-03 10:55:26 -06:00
Mike Place
bd151ff49b Merge pull request #41004 from corywright/implement-file-auth
Add salt.auth.file module for simple file based authentication
2017-05-03 10:54:24 -06:00
Daniel Wallace
6d17e36ad2 add extmod whitelist and blacklist to tops 2017-05-03 10:20:26 -06:00
Nicole Thomas
ff68bbd9f4 Merge pull request #41023 from cloudflare/more-nitro-docs
More Nitrogen docs
2017-05-03 10:17:03 -06:00
Erik Johnson
72ef34c420 Do not force effective saltenv when running states via orchestration
The saltenv argument from state orchestration was being ignored in favor
of the magic __env__ dunder. This affects highstates run via
orchestration, which by default should process all envs in the loaded
tops.
2017-05-03 11:14:36 -05:00
rallytime
b93e35dd06 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/engines/docker_events.py
2017-05-03 10:00:24 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-03 09:59:09 -06:00
rallytime
d26fd0bbf4 Merge branch '2016.3' into '2016.11'
No conflicts.
2017-05-03 09:57:23 -06:00
Drew Malone
2df93ae3ab Update management of ip addresses.
- Assign static, private IP addresses.
- Ability to not assign a public IP to a VM.
2017-05-03 09:36:03 -06:00
Erik Kristensen
6dd4a5f1d0 only log debug if per-saltenv config is defined 2017-05-03 08:38:21 -06:00
Mircea Ulinic
a69e88055d Outputters txt ref 2017-05-03 15:13:05 +01:00
Ignat Korchagin
0d6da33391 Update grains unit test to support reading firmware grains from sysfs in Linux 2017-05-03 13:10:29 +00:00
Mircea Ulinic
225014c3fb Add New Modules section 2017-05-03 11:50:28 +00:00
Mircea Ulinic
6c44452c90 More NAPALM notes 2017-05-03 11:37:40 +00:00
Michael Lustfield
49bd8bfed9 Fixing a spelling error. 2017-05-03 03:21:58 -05:00
Michael Lustfield
a4bae3cda9 Cleaning up (removing) use of safe_batch token. 2017-05-03 03:14:10 -05:00
Michael Lustfield
02614bdfd1 New feature: automatic job batching
This commit creates a new feature that provides automatic batching of
jobs if the job would have executed on too many minions.

See comments provided in commit for additional details.
Ref: #19054 (https://github.com/saltstack/salt/issues/19054)
2017-05-03 03:08:24 -05:00
Daniel Wallace
97e67e262f fix unit tests for dockermod 2017-05-02 18:50:03 -06:00
Daniel Wallace
9c23fdc713 pylint again 2017-05-02 17:28:02 -06:00
Daniel Wallace
3fe8af4316 remove opensuse image too 2017-05-02 16:43:42 -06:00
Daniel Wallace
a09eb0453a clean up test 2017-05-02 16:39:07 -06:00
Daniel Wallace
185c405265 fix dockermod test 2017-05-02 16:31:38 -06:00
rallytime
bed524a731 Update test hash to be sha256 instead of md5 2017-05-02 16:20:06 -06:00
Daniel Wallace
948830a4cb add tests 2017-05-02 16:16:51 -06:00
Nicole Thomas
4a45dbdbac Merge pull request #41013 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-02 16:09:40 -06:00
Nicole Thomas
97500f078d Merge pull request #41012 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-02 16:06:39 -06:00
Nicole Thomas
b00acb0034 Merge pull request #41011 from terminalmage/docker-refresh-credentials
Use proposed docker-py reload_config() function
2017-05-02 16:06:21 -06:00
Daniel Wallace
d32dfe46e3 fix pylint 2017-05-02 16:06:14 -06:00
Daniel Wallace
bd9f4ecdee use get_exec_driver in copy_to 2017-05-02 16:06:14 -06:00
Daniel Wallace
c37a0efcdc use tarfile module instead of tar binary 2017-05-02 16:06:14 -06:00
Daniel Wallace
596385ff6b use copy_to to copy thin.tgz in docker.call
put_archive does not extract the files using the user that the container is
running as.  With this change, the files are copied as the running user, and
then extracted owned by the container user.

This change lets the docker.call and docker.sls commands run as a non root user.

Also add cachedir to the salt-call options

And put both the minion log file and the cachedir in the docker thin tarball
directory
2017-05-02 16:06:14 -06:00
twangboy
c7d164423e Increase timeout of run_function 2017-05-02 16:01:06 -06:00
Ignat Korchagin
74508eb125 Read some hardware grains from sysfs on Linux, if available
On some lightweight Linux setups neither smbios nor dmidecode is present.
However, we can get most of the hardware related information directly from
sysfs. This requires CONFIG_DMIID to be enabled in Linux kernel configuration,
however it is the default for x86 vanilla defconfig and present on all major
Linux distributions.
2017-05-02 21:57:13 +00:00
Erik Kristensen
2ddfe49a8b Merge pull request #1 from terminalmage/pr-40985
Improve all_saltenvs docs
2017-05-02 15:57:07 -06:00
Erik Johnson
85f275c591 Add debug logging for cases where all_saltenvs overrides the per-saltenv configuration 2017-05-02 16:38:32 -05:00
Erik Johnson
d6cd5056cf Enhance the Global Remotes docs 2017-05-02 16:37:56 -05:00
Erik Johnson
f73050fd0f mention all_saltenvs and link back to gitfs walkthrough 2017-05-02 16:37:47 -05:00
Carsten Brandt
bf7a0076dd Fixed typo in pkg state documentation
A `:` is missing for the yaml to be valid. This was introduced by f4abf7f03a, which added sub items but missed changing this line too.
2017-05-02 23:37:31 +02:00
Cory Wright
e7c8f99509 slightly corrected documentation around python-passlib 2017-05-02 16:05:08 -04:00
Erik Johnson
b8d1dcc307 Use proposed docker-py reload_config() func
See https://github.com/docker/docker-py/pull/1586

This allows an existing client instance to disregard its cached auth
config and use the most up-to-date login info from the config.json.
2017-05-02 15:03:19 -05:00
Julien Leproust
3b9a845145 Recognize LVM2 pv with empty vg as orphan 2017-05-02 21:59:56 +02:00
Cory Wright
cd0555d374 remove outdated comment 2017-05-02 15:38:53 -04:00