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
67,079 Commits 24 Branches 182 Tags 341 MiB
131d3a1911
Commit Graph

67079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
a4482c000f Merge pull request #31492 from m03/add-source_hash-to-win_pkg 
Add source_hash param to win_pkg
 2016-02-26 08:06:27 -07:00
Mike Place
00ffa294ad Merge pull request #31437 from ScoreUnder/fix_ini_issues 
Fix ini issues
 2016-02-26 08:03:12 -07:00
Mike Place
2c059fb74f Merge pull request #31495 from rallytime/followup-docs-31490 
Doc updates for runners.manage.bootstrap changes
 2016-02-26 08:02:04 -07:00
Mike Place
137bbae0c3 Merge pull request #31500 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-02-26 08:01:47 -07:00
Mike Place
92f8f89218 Merge pull request #31497 from rallytime/remove-timeout-dup 
Remove duplicate "timeout" definition in Roster docs
 2016-02-26 08:01:30 -07:00
Dmitry Kuzmenko
b454fc6c1a Don't fork in try with critical finally logic. 
Fork executes finally section triple times.
 2016-02-26 17:08:13 +03:00
Stefan Schweer
7afc562db6 fixed event data for salt cloud created 2016-02-26 15:00:04 +01:00
Stefan Schweer
f8cd487f6e manage file accepts show_changes but was passed show_diff 2016-02-26 14:36:46 +01:00
Stefan Schweer
b231c144ce fixed event data for nova cloud provider 2016-02-26 14:34:19 +01:00
Michael Calmer
66e8f6aa37 restructure the code a bit 2016-02-26 14:29:18 +01:00
Michael Calmer
f5c125de19 remove new lines between zypper command and check result 2016-02-26 14:20:11 +01:00
Denys Havrysh
50f3e072b1 Add instruction how to install salt-minion on Debian Jessie from Stretch 2016-02-26 15:10:37 +02:00
Michael Calmer
1425c6496c use specialized assert functions for tests 2016-02-26 13:54:15 +01:00
Michael Calmer
f266cfdaac test _zypper_check_result() 2016-02-26 13:54:15 +01:00
Michael Calmer
aff6467782 adapt tests to new zypper_check_result() output 2016-02-26 13:54:14 +01:00
Michael Calmer
edad780cdf use _zypper_check_result() 2016-02-26 13:54:14 +01:00
Stefan Schweer
634348c3c1 Merge branch 'develop' of github.com:saltstack/salt into develop 2016-02-26 13:17:05 +01:00
Denys Havrysh
abcd505178 Update Debian installation guide with information about Raspbian 2016-02-26 13:30:22 +02:00
Michael Calmer
7c5d5a2b7a add _zypper_check_result() to raise and error or return stdout 2016-02-26 12:26:11 +01:00
Michael Calmer
a6785ef7a9 check zypper exit code everywhere 2016-02-26 12:26:11 +01:00
Michael Calmer
935b0510c9 add function to check zypper exit codes 2016-02-26 12:26:11 +01:00
Stefan Schweer
36cfedb7b7 fixed unitentionally modified salt.spec 2016-02-26 11:55:23 +01:00
Stefan Schweer
b22178ce70 send ips with event data 2016-02-26 11:44:34 +01:00
Stefan Schweer
3ee75d9740 reverted uintentional changes in doc folder 2016-02-26 11:22:22 +01:00
Mikhail Sokolov
1535dceddd slack module: add slack incomming webhook suport. 2016-02-26 14:41:23 +07:00
rallytime
2073ca4dd1 Pylint fix 2016-02-25 17:34:25 -07:00
Nicole Thomas
9d458bb420 Merge pull request #31498 from Ch3LL/rename_test 
rename methods in pkg states test
 2016-02-25 16:29:51 -07:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
Nicole Thomas
2ede32aaf8 Merge pull request #31493 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-25 15:52:25 -07:00
rallytime
a41ce26287 Actually mock cmd.run_all call... 2016-02-25 15:11:25 -07:00
Ch3LL
29a53f4353 rename methods in pkg states test 2016-02-26 06:54:01 +09:00
rallytime
e8f5f9b67a Fix zypper_test: Zypper function uses cmd.run_all, not cmd.run in 2016.3 2016-02-25 14:23:36 -07:00
rallytime
83e6480d20 Remove duplicate "timeout" definition in Roster docs 2016-02-25 14:05:38 -07:00
rallytime
aa1a8d86ae Move script_args closer to script in kwargs list without causing API change 2016-02-25 14:01:01 -07:00
rallytime
8595e5f7ba Doc updates for runners.manage.bootstrap changes 2016-02-25 13:45:03 -07:00
Nicole Thomas
625da0d261 Merge pull request #31471 from cachedout/issue_31427 
Correct issue where duplicate items in grains list during state run will result in duplicate grains
 2016-02-25 13:15:20 -07:00
rallytime
03fd26dcaa Pylint fix with correct refactor from removing 'action' in zypper module 2016-02-25 13:07:57 -07:00
Mike Place
2d732c99a6 Merge pull request #31490 from techhat/manageboot 
Switch manage.bootstrap to Salt SSH
 2016-02-25 13:02:47 -07:00
Nicole Thomas
72e85c875a Merge pull request #31491 from cachedout/hlub_glusterfs_develop 
Refactored GlusterFS support
 2016-02-25 12:45:48 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Nicole Thomas
e85ae2341a Merge pull request #31455 from ticosax/diable-NOTSET-check 
[dockerng] Disable notset check
 2016-02-25 12:15:09 -07:00
Mike Place
2e687b592b Merge pull request #31489 from rallytime/pr-template-fix 
Fix PR Template = Checkbox markdown should be a list
 2016-02-25 11:39:04 -07:00
Joseph Hall
71b1106750 Get ssh_user, etc working 2016-02-25 11:25:41 -07:00
Mike Place
e68a0947b7 Merge pull request #31488 from isbm/isbm-zypper-ut-removepurge 
Unit Test for Zypper's "remove" and "purge"
 2016-02-25 10:52:33 -07:00
Morrie Winnett
8690188558 Add source_hash param to win_pkg 
Addresses issues saltstack/salt#14872, saltstack/salt-winrepo#492, and
concerns raised in saltstack/salt#27093 and saltstack/salt#20737.
 2016-02-25 09:47:52 -08:00
hlub
1494c44918 Refactored GlusterFS support 
Usage of GlusterFS states did not change except the state 'created' was deprecated in favor of more descriptive name 'volume_present'.
- Improved separation of functionality in the execution module from the states. Module functions now return booleans instead of varying
strings. Parsing those strings in the states was very error-prone. In glusterfs.peer() function this problem was earlier solved by returning
a dict containing both the exit value and output string of the gluster call. This could be a good idea, although without calling the gluster
calls twice, and applied to other functios too.
- Calls to gluster are now logged more verbosely, while a failing call no longer raises an immediate exception.
- Improved checking and verbosity in the state level. Cleaned code a lot, removed some bugs and other odd behaviour.
- Updated tests to match the changes. Refactored some test code to be more readable. Added assertions to test that some functions are not
called when things are already in the desired state. Preferred changing behaviour of the mocked functions while proceeding instead of listing
all of the return values first.
- Replaced glusterfs.list_peers() with more informative peer_status() and deprecated the old name. The function now returns a dict with UUIDs as its keys.
- glusterfs.info() can now be called without volume name. It always returns a dictionary. Use this function instead of status() in sates.
- Functions glusterfs.delete() and glusterfs.create() were deprecated and renamed to delete_volume() and create_volume().
 2016-02-25 10:46:43 -07:00
Mike Place
f07e2dd7a1 Merge pull request #31483 from The-Loeki/rfe-acme 
Recommit letsencrypt-auto mod/state in develop
 2016-02-25 10:33:00 -07:00
Nicolas Delaby
e072937243 dockerd returns sometimes None or [] for ports. 2016-02-25 18:18:59 +01:00
Joseph Hall
70b8574285 Switch manage.bootstrap to Salt SSH 2016-02-25 10:10:04 -07:00
Nicole Thomas
cd87760c87 Merge pull request #31485 from jacobhammons/2015.8 
Fixed transport description in minion / master config
 2016-02-25 10:04:15 -07:00