valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,621 Commits 24 Branches 182 Tags 341 MiB
01a012bbdf
Commit Graph

81621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mircea Ulinic
c249551393 net.load_config arg: text instead of config 
RTFM: https://docs.saltstack.com/en/develop/ref/modules/all/salt.modules.napalm_network.html#salt.modules.napalm_network.load_config
 2017-05-04 14:07:01 +01:00
Mircea Ulinic
35335dd8e9 More opts and fixes 2017-05-04 12:50:49 +00:00
Debian
3f6fea2e1a Fix netyang modules and examples 2017-05-04 12:41:34 +00:00
Dmitry Kuzmenko
51594d9f81 Non-recursive fibonacci implementation. 2017-05-04 12:52:32 +03:00
peter-funktionIT
80fa9e5b76 Update win_pki.py 
Add warning about passwords.
 2017-05-04 11:23:48 +02:00
Mircea Ulinic
ce55d85c96 Double 'that' 2017-05-04 09:17:17 +00:00
Mircea Ulinic
727d220942 More salt-minion on ntwrk gear notes 2017-05-04 09:09:08 +00:00
Mircea Ulinic
2a8c9e43dc Index napalm automation docs under the top-level TOC 2017-05-04 09:09:08 +00:00
Mircea Ulinic
9317a4595c One more phrase at the end... 2017-05-04 09:09:08 +00:00
Mircea Ulinic
cd9921d62b Add NAPALM logo 2017-05-04 09:09:08 +00:00
Mircea Ulinic
5e99a1737c Start working on network automation docs 2017-05-04 09:09:03 +00:00
Alexey Aksenov
b69406a9f2 Add skip filter to jinja template 
Allow to update dictionary value within jinja loop

{% set _stash = {} %}
{% for a in b -%}
{%   if _stash.get('key') -%}
{{     _stash.update({'key': a}) | skip -}}
{%   endif -%}
{% endfor -%}
 2017-05-04 10:56:55 +03:00
Nicole Thomas
0e0a73fd91 Merge pull request #41052 from terminalmage/gate-git_opts 
Gate the new git_opts argument in git execution module
 2017-05-03 17:10:06 -06:00
Nicole Thomas
2bf02fad81 Merge pull request #41050 from terminalmage/git_pillar-tests 
Fix git_pillar integration tests on Arch
 2017-05-03 16:53:31 -06:00
Nicole Thomas
ec214760df Merge pull request #41055 from saltstack/revert-40899-remove-md5-warning 
Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings"
 2017-05-03 16:49:55 -06:00
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Nicole Thomas
2b47b7bec6 Merge pull request #41045 from terminalmage/clarify-gitfs-docs 
Clarify gitfs docs
 2017-05-03 16:24:54 -06:00
Tom Williams
e75b59fbd8 INFRA-4795 - derp, only return None on test=True if changes are scheduled, True otherwise. 2017-05-03 18:07:35 -04:00
Erik Johnson
ee493bae47 Update package targets for Arch pkg tests 
Something else is installing pytz (likely via pip), causing filesystem
conflicts when the pkg integration tests try to install python2-pytz as
a dep of python2-django.

This commit also changes a bunch of the other tests so that they are
explicitly skipped instead of just being no-ops in cases where they are
not configured to be run. This provides more accurate information in the
overall test results.
 2017-05-03 17:02:32 -05:00
Tom Williams
e3937ec5c2 INFRA-4795 - fix logic for volume tagging in EC2 2017-05-03 17:38:04 -04:00
Erik Johnson
f77393b80d Skip git_pillar integration tests on cent6 
Cent6 has too old of a version of git to handle the make_repo func that
spawns the git repos used in these tests.
 2017-05-03 16:36:36 -05:00
Erik Johnson
bd5e0bdbe3 Gate the new git_opts argument in git execution module 
The -c argument for git was added in version 1.7.2, but RHEL6 has 1.7.1.
This commit performs a version check if git_opts are passed, and raises
an exception if the git version is < 1.7.2.
 2017-05-03 16:31:58 -05:00
twangboy
2af38e5564 Use target instead of version_num 2017-05-03 14:20:40 -06:00
Erik Johnson
a94d081004 Add check for git-http-backend 
This allows for more graceful test failures when the libexec dir is
different from what the test class determines it should be.
 2017-05-03 15:16:16 -05:00
Erik Johnson
33515f6a14 Fix git_pillar integration tests on Arch 
The location of the git-http-backend is within /usr/lib instead of
/usr/libexec.

This also uncomments a line that was commented out for troubleshooting
purposes.
 2017-05-03 14:49:14 -05:00
Ch3LL
ba223827b9
fix integration wheel test_gen test 2017-05-03 15:37:44 -04:00
Nicole Thomas
8caacf0146 Merge pull request #41034 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-03 13:32:13 -06:00
Nicole Thomas
819007cd00 Merge pull request #41032 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-03 13:31:58 -06:00
Nicole Thomas
31c8b60ebf Merge pull request #41040 from gtmanfred/vaultdoc 
link vault pillar docs to vault module docs
 2017-05-03 13:31:34 -06:00
Mike Place
a27b3fa92f Merge pull request #40872 from Lex-Persona/fix-service-test 
Fix service.running when test=true
 2017-05-03 13:06:01 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs 
This improves cross links to the per-remote docs from the master config
file documentation.
 2017-05-03 13:34:56 -05:00
Mike Place
d7fbd38474 Merge pull request #41007 from jleproust/fix_lvm_empty_vg 
Recognize LVM2 pv with empty vg as orphan
 2017-05-03 12:24:50 -06:00
Mike Place
43af2669f6 Merge pull request #41010 from twangboy/fix_test_standard 
Fix test_full_returns integration test on Windows
 2017-05-03 12:18:25 -06:00
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