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
66,874 Commits 24 Branches 182 Tags 341 MiB
40cd0ac8fe
Commit Graph

66874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
rallytime
a6b1b61c09 Fix PR Template = Checkbox markdown should be a list 2016-02-25 09:58:02 -07:00
Bo Maryniuk
d30f2e4627 Implement unit test for remove and purge 2016-02-25 17:48:03 +01:00
Bo Maryniuk
4caf201052 Refactor code (a bit) 2016-02-25 17:48:03 +01:00
Bo Maryniuk
df89da4d15 Fix the docstring 2016-02-25 17:48:03 +01:00
Jacob Hammons
748acab8b5 Fixed zeromq casing in transport settings 2016-02-25 09:38:41 -07:00
Mike Place
db3d61158f Merge pull request #31351 from alxbse/powershell-encode-cmd 
Adds support for encoded PowerShell commands.
 2016-02-25 09:33:15 -07:00
Mike Place
41fe0233a8 Merge pull request #31474 from rallytime/github-templates 
Created GitHub Issue and PR templates
 2016-02-25 09:22:03 -07:00
Mike Place
fb1ef92e2b Merge pull request #31411 from jtand/beacons_tests 
Added some beacons execution module integration tests
 2016-02-25 09:16:26 -07:00
Mike Place
e483978fc8 Merge pull request #31423 from twangboy/win_system_dev 
Fix uppercase computer names
 2016-02-25 09:15:58 -07:00
Mike Place
33a25c79ea Merge pull request #31469 from techhat/spmdeps 
Refactor SPM install to properly manage dependencies
 2016-02-25 09:15:21 -07:00
Jacob Hammons
765a226907 Fixed transport description in minion / master config 2016-02-25 09:08:54 -07:00
Nicole Thomas
2e9a705e75 Merge pull request #31475 from jacobhammons/2015.8 
Assorted doc issues
 2016-02-25 09:03:54 -07:00
Mike Place
3905dd81d3 Merge pull request #31477 from vutny/correct-doc-install-ubuntu 
Correct installation documentation for Ubuntu
 2016-02-25 09:01:38 -07:00
Mike Place
f027dc0cf8 Merge pull request #31479 from isbm/isbm-zypper-unittest 
Zypper unit tests & fixes
 2016-02-25 08:58:15 -07:00
Mike Place
101606f3d0 Merge pull request #31476 from jfindlay/refactor_runtests 
Refactor runtests
 2016-02-25 08:56:09 -07:00
rallytime
7ce2375a90 Lowercase some words 2016-02-25 08:49:46 -07:00
Ronald van Zantvoort
7fdf13bd73 Recommit letsencrypt-auto mod/state in develop 2016-02-25 14:46:18 +01:00
Bo Maryniuk
9f64333ccb Do not use Zypper purge (reason: too dangerous) 2016-02-25 14:00:45 +01:00
Bo Maryniuk
bc05acf7c3 Fix PyLint 2016-02-25 14:00:12 +01:00
Denys Havrysh
172f34a6ca Correct headers in Debian/Ubuntu/SUSE install instructions 2016-02-25 11:51:40 +02:00
Denys Havrysh
4248f9ea0a Add common packages installation section to Debian install guide 2016-02-25 11:04:11 +02:00
Denys Havrysh
8c6e179870 Add note about amd64 packages to Ubuntu install guide 2016-02-25 11:02:07 +02:00
Alexander Backlund
b256f2d8b5 Renamed flag encoded_cmd 2016-02-25 00:56:40 -08:00
Denys Havrysh
afaa24723a Update Ubuntu install guide: 
- remove duplicate sections
- add `salt-api` and `salt-cloud` to the example
 2016-02-25 10:24:55 +02:00
Justin Findlay
0fb1bbb883 tests.runtests: rename cloud provider tests 2016-02-24 22:16:57 -07:00
Justin Findlay
a98bcf6fd1 tests.runtests: reorder arg declarations 2016-02-24 22:16:57 -07:00
Justin Findlay
bc60c02cfe tests.runtests: refactor test suite usage 2016-02-24 22:16:57 -07:00
Justin Findlay
7a04ae5558 tests.runtests: add test suite data and fcns 2016-02-24 22:16:57 -07:00
Joseph Hall
7fd530912d Fix test errors 2016-02-24 18:51:56 -07:00
Jacob Hammons
a72dc15720 Assorted doc issues 
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
 2016-02-24 16:56:52 -07:00
rallytime
c287e6db55 Created GitHub Issue and PR templates 2016-02-24 16:05:00 -07:00
Joseph Hall
ca48a3e8df Lint 2016-02-24 14:03:02 -07:00
Nicole Thomas
3dba716bba Merge pull request #31460 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-24 13:46:14 -07:00