valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,788 Commits 24 Branches 182 Tags 341 MiB
64ed9fcd01
Commit Graph

60788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
eebc325040 Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options 2016-02-18 16:34:14 -06:00
Mike Place
f0ba9c1eca Merge pull request #31326 from ticosax/2015.8-dockerng-detect-settings-removal 
[dockerng ] Detect settings removal
 2016-02-18 15:02:50 -07:00
Nicolas Delaby
7bedd86ebe Add detection of removed settings. 
When removing settings from dockerng.running state definition,
changes where ignored as `_compare()` was iterating only over user defined
parameters.

By looping over all available options we are now sure to not miss
removed entries.

Extend definition of expected default values:

 - Some default values are predictable and hardcoded in the VALID_CREATE_OPTS dict.
 - Some default needs to be read from images (`image_path`)
 - Some defaults values are unpredictable (hostname, mac_address)
 we are comparing desired value against value reported by the container
 (`get_default_from_container`).
 2016-02-18 20:23:31 +01:00
Mike Place
130f515391 Merge pull request #31292 from twangboy/win_servermanager 
Fix dunder virtual to check for Remote Administration Tools
 2016-02-18 11:57:26 -07:00
Mike Place
5d31714b44 Merge pull request #31287 from joejulian/2015.8_30932_peer_probe_by_ip 
Rework tests and fix reverse peering with gluster 3.7
 2016-02-18 10:57:23 -07:00
Mike Place
a2f6447f8d Merge pull request #31196 from sakateka/utils-network-fix 
Here are a few fixes utils.network
 2016-02-18 10:27:00 -07:00
Mike Place
d20a30b8be Merge pull request #31299 from rallytime/fix-29795 
Allow state-output and state-verbose default settings to be set from CLI
 2016-02-18 10:25:23 -07:00
Mike Place
25d8af21c9 Merge pull request #31317 from terminalmage/git-version-audit 
Fix versonadded directive
 2016-02-18 09:56:32 -07:00
Erik Johnson
acc3b54621 Fix versonadded directive 2016-02-18 10:14:32 -06:00
Mike Place
f2b662371c Merge pull request #31301 from terminalmage/issue30999 
Corrected fix for #30999
 2016-02-18 08:59:39 -07:00
Mike Place
408d89e174 Merge pull request #31302 from terminalmage/git-version-audit 
Audit CLI opts used in git states
 2016-02-18 08:58:48 -07:00
Mike Place
098f05eb3c Merge pull request #31312 from terminalmage/merge-forward-2015.5-2015.8 
Merge 2015.5 into 2015.8
 2016-02-18 08:57:08 -07:00
Erik Johnson
808d150fe4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.5-2015.8 2016-02-18 09:03:30 -06:00
Erik Johnson
ca410c0a94 Audit CLI opts used in git states 
This restricts the git state module to git 1.6.5 or later, as some of
the core functionality needed for git.latest was not present before that
version. This release is over 6 years old now, so this change should be
safe to make.

In addition, this stops git.latest from trying to use the --ff-only
argument when running a git merge to fast-forward the repo, in versions
where this option is not available.
 2016-02-18 08:18:46 -06:00
Michael Calmer
3df302fcb7 call zypper with option --non-interactive everywhere 2016-02-18 10:12:55 +01:00
Erik Johnson
625af70e08 Fix --unset-upstream handling 
This fixes problems with the --unset-upstream handling added in the
previous commit.

See https://github.com/saltstack/salt/pull/31245#issuecomment-185568476
for more info.
 2016-02-18 00:47:50 -06:00
Jorge Espada
7940881797 fix git state github issue #30999 2016-02-18 00:31:14 -06:00
Erik Johnson
c58f654bc3 Merge pull request #31225 from pprince/PR/bugfix/file_tree 
Fix in file_tree pillar (Fixes #31223.)
 2016-02-18 00:06:12 -06:00
rallytime
483f31922b Allow state-output and state-verbose default settings to be set from CLI 
Fixes #29795
 2016-02-17 20:02:18 -07:00
twangboy
89b47ab3c5 Update return documentation for install/remove 2016-02-17 15:12:11 -07:00
Mike Place
cd3400e67e Merge pull request #31288 from notpeter/ssh_known_hosts_docs 
Improve salt.states.ssh_known_hosts documentation.
 2016-02-17 15:09:18 -07:00
twangboy
a0be43120b Fix cmd_quote error 2016-02-17 15:03:20 -07:00
twangboy
13cd57a890 Remove repeating Import ServerManager command 
Improved documentation
 2016-02-17 14:52:52 -07:00
twangboy
3270a2859f Add check for server manager module 2016-02-17 14:36:09 -07:00
twangboy
4bdae47a44 Added checks for Windows 2008 R2 2016-02-17 14:11:40 -07:00
Joe Julian
783e9b2e13 Rework tests and fix reverse peering with gluster 3.7 
Reworked the test structure design for the gluster module and state so I
could create a test that mimiced the behavior difference between 3.7 and
prior versions when reverse probing by ip a server that already exists.

Added the additional data given by gluster 3.7 to the output of
glusterfs.list_peers to allow us to compare a requested peering against
a host's aliases.

Fixes #30932
 2016-02-17 13:10:07 -08:00
Peter Tripp
3f573d89a2 Improve salt.states.ssh_known_hosts documentation. 2016-02-17 12:59:43 -08:00
Mike Place
fe9e5d27e6 Merge pull request #31233 from mcalmer/2015.8-zypperpy-add-version_cmp 
implement version_cmp for zypper
 2016-02-17 13:20:19 -07:00
Mike Place
93c03a400b Merge pull request #31273 from rallytime/merge-2015.5 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-02-17 13:14:05 -07:00
Mike Place
875d9925fa Merge pull request #31183 from heyfife/fix-gce-named-static-ip-reservation 
Fixed named external_ip reservation/re-use code in gce driver.
 2016-02-17 12:02:27 -07:00
Mike Place
e56c402c0c Merge pull request #31032 from terminalmage/issue31001 
(2015.5 branch) yumpkg: ensure that dnf-plugins-core >= 0.1.15 is installed
 2016-02-17 12:02:03 -07:00
rallytime
11cfb636fb Pylint fix 2016-02-17 11:09:07 -07:00
Mike Place
dc2e7c8956 Merge pull request #31253 from gtmanfred/2015.8 
allow for nova servers to be built with premade volumes
 2016-02-17 10:55:39 -07:00
Mike Place
cec69b74f0 Merge pull request #31264 from sjorge/if_missing-155-fix 
fix if_missing gets appended to dirs list, take III
 2016-02-17 10:12:25 -07:00
Mike Place
29e3dd091d Merge pull request #31271 from rallytime/bp-30689 
Back-port #30689 to 2015.8
 2016-02-17 09:52:36 -07:00
rallytime
023ad4635c Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/win_update.py
  - salt/states/win_update.py
 2016-02-17 09:33:08 -07:00
Jorge Schrauwen
3dae79d516 fix nested grains always show update due to __grains__.get() not supporting the ":" seperator 2016-02-17 08:58:04 -07:00
Michael Calmer
389a4b2548 Check if rpm-python can be imported 2016-02-17 08:49:15 +01:00
Jorge Schrauwen
545edbf5e1 fix if_missing gets appended to dirs list, take III 2016-02-17 07:09:47 +00:00
Mike Place
fcfc6f4fd3 Merge pull request #31255 from jacobhammons/doc-fixes 
Fixes #30461
 2016-02-16 19:23:46 -07:00
Erik Johnson
42daea4509 yumpkg.py: Remove repoquery usage everywhere but check_db 2016-02-16 17:47:48 -06:00
Erik Johnson
50befbc149 backport salt.utils.pkg.rpm to 2015.5 2016-02-16 17:24:04 -06:00
Daniel Wallace
36bf06e539 fix doc for boot_volume 2016-02-16 17:22:40 -06:00
Jacob Hammons
3c4f8215c3 Fixes #30461 
Credited Sebastian Kramer for finding CVE 2016-1866 in release notes
Added note about salt virt not working on KVM in a VM
 2016-02-16 15:53:35 -07:00
Daniel Wallace
9660c91b57 allow for nova servers to be built with premade volumes 
if the boot_volume is specified, allow for that to be used instead of an image
 2016-02-16 15:43:51 -06:00
Mike Place
62d76902ce Merge pull request #31189 from dmacvicar/dmacvicar-2015.8-31106 
Fix crash with scheduler and runners (#31106)
 2016-02-16 11:49:36 -07:00
Mike Place
dc78d0a504 Merge pull request #31201 from The-Loeki/patch-1 
Utilize prepared grains var in master-side ipcidr matching
 2016-02-16 11:36:10 -07:00
Mike Place
60bbac36fa Merge pull request #31239 from terminalmage/better-bad-load-logging 
Improve logging when master cannot decode a payload
 2016-02-16 09:35:45 -07:00
Mike Place
80f1c3553b Merge pull request #31190 from twangboy/refresh_db 
Clear minion cache before caching from master
 2016-02-16 09:11:26 -07:00
Michael Calmer
6ad6a90955 pylint changes 2016-02-16 16:40:21 +01:00