valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,761 Commits 24 Branches 182 Tags 341 MiB
c459557992
Commit Graph

2033 Commits

Author SHA1 Message Date
Erik Johnson
8a836c88f4 Update systemd tests 2016-02-01 10:18:08 -06:00
Daniel Hobley
0a1da63d6a Added the ability to set OS X settings using defaults 2016-02-01 15:24:02 +01:00
Daniel Hobley
8598262d4e Lint fixes 2016-02-01 14:50:13 +01:00
Daniel Hobley
f701547027 Added ability to install PKG, DMG and APP files for OS X minions 2016-02-01 14:22:22 +01:00
Thomas S Hatch
e202ce1ce0 Merge pull request #30698 from Unity-Technologies/feature/win-firewall-icmp 
Added the ability to enable icmp rules on Windows Firewalls
 2016-01-31 12:09:29 -07:00
Colton Myers
291fe929e4 Merge pull request #30754 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2016-01-29 17:11:31 -07:00
Mike Place
fe19ca4480 Merge pull request #30729 from Unity-Technologies/feature/dism 
Added DISM module and states
 2016-01-29 17:10:32 -06:00
Colton Myers
967e862027 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/loader.py
    salt/modules/npm.py
    salt/pillar/__init__.py
 2016-01-29 15:51:52 -07:00
Colton Myers
84eeab7720 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/returners/local_cache.py
 2016-01-29 14:57:31 -07:00
Daniel Hobley
6ad5014968 Lint fixes 2016-01-29 15:29:06 +01:00
Daniel Hobley
bb241c1931 Lint fixes 2016-01-29 15:18:16 +01:00
Daniel Hobley
a4f4e52687 Added xattr module and state for OS X 
- Allows you to add and remove special attributes to/from files
 2016-01-29 15:01:40 +01:00
Daniel Hobley
d80a637d2e Added ability to change assistive access on OSX 10.9+ 2016-01-29 13:59:51 +01:00
Daniel Hobley
3aeafd7f54 Lint fixes 2016-01-29 12:34:35 +01:00
Daniel Hobley
bae0543d95 Added the ability to configure keychains on OSX 2016-01-29 11:47:43 +01:00
Daniel Hobley
e8c3a154f0 Added DISM module and states 
- Allows you to install features and capabilities on windows minions
 2016-01-29 10:35:58 +01:00
Daniel Hobley
76a788529a Merge branch 'develop' into feature/win-firewall-icmp 2016-01-29 09:35:41 +01:00
Daniel Hobley
efdc953867 Merge branch 'develop' into feature/proxy-settings 2016-01-29 09:35:31 +01:00
Kris Raney
b4d27451d1 Merge branch 'develop' into boto_apigateway 2016-01-28 15:35:34 -06:00
Daniel Hobley
e40092a103 Added the ability to enable icmp rules on Windows Firewalls 
- Added more checks in the unit tests
- Updated unit tests to check for ICMP rules
 2016-01-28 14:38:50 +01:00
Daniel Hobley
6f266cdd73 Added ability to set proxy settings on OSX and Windows 2016-01-28 13:21:15 +01:00
Steve Hajducko
3544dd995e Fix lsscsi issues for certain platforms 
The lsscsi command doesn't support the '-s' flag on any RHEL/CentOs system
until RHEL7.

The command now have an option to specify 'get_size' to enable
compatibility with the older platforms.

Also fixes some issues with lsscsi not being installed and exceptions
getting thrown because of that.
 2016-01-27 21:15:26 -08:00
Nicole Thomas
d6e2c7aa82 Merge pull request #30614 from techhat/depimg 
WIP: Deprecate salt/modules/img.py
 2016-01-26 15:03:11 -07:00
Joseph Hall
29df2124a2 Remove tests for img.py since we're deprecating it 2016-01-26 11:00:38 -07:00
Kris Raney
8825cd095b Merge branch 'develop' into boto_apigateway 2016-01-26 10:27:44 -06:00
Mark Kimsal
6ceeea6b62 Add enabled, disabled, enable, disable to runit 
New methods test if the standard 'run' file in the services folder has
the executable bit set.  When the 'run' file is not executable, runit
will not launch the service on boot.  This mimicks the enabled/diabled
behavior of other service providers.

The file permissions are set to 700 and 600 for enabled and disabled
states.  Because of the ad-hoc nature that runit service files can
sometimes posess, the run files may have passwords or other sensitive
information.  Therefore, the permissions are hard coded to only be
readable by the file owner, who is also the user who runs the process.

This brings the runit module more inline with other service providers
so when it is used in a state (with provider: runit) more options can
be used, like enabled: True
 2016-01-26 08:25:44 -05:00
Colton Myers
621d8785de Merge pull request #30579 from sjorge/module-localemod 
Fix up salt.modules.locale(mod) for Solaris and some generic improvements
 2016-01-25 17:21:42 -07:00
Colton Myers
64f17568a4 Merge pull request #30627 from sjmh/etcd_set_tree 
Add etcd update function
 2016-01-25 17:07:46 -07:00
Winston Liu
54c111e5e1 Merge branch 'boto_lambda' into boto_apigateway 2016-01-25 15:51:10 -08:00
Colton Myers
818ff2af78 Merge pull request #30381 from quantonganh/launchctl-yosemite 
Launchctl yosemite
 2016-01-25 16:08:25 -07:00
Steve Hajducko
a015473d4e Add etcd update function 
Adds a update function that takes a dict and sets multiple etcd keys.
 2016-01-25 14:13:33 -08:00
Nicole Thomas
653292ec88 Merge pull request #30555 from twangboy/mac_brew 
renamed brew.py to mac_brew.py
 2016-01-25 12:30:31 -07:00
Jorge Schrauwen
4d2fa2e2aa switch unit test to except CommandExecutionError 2016-01-25 19:30:09 +00:00
Nicole Thomas
25f127c948 Merge pull request #30580 from sjorge/module-timezone 
salt.modules.timezone improvements for Solaris-like OS's
 2016-01-25 11:43:25 -07:00
Nicole Thomas
b8009d7320 Merge pull request #30552 from twangboy/mac_pkgutil 
Renamed darwin_pkgutil.py to mac_pkgutil.py
 2016-01-25 10:47:57 -07:00
Nicole Thomas
fb0054afb5 Merge pull request #30556 from twangboy/mac_sysctl 
rename darwin_sysctl.py to mac_sysctl.py
 2016-01-25 10:46:04 -07:00
Jorge Schrauwen
98664445c7 Swapping one unknow for debian failed, because debian use a different 
function internally. Switched to RedHat for the test as it returns
LANG=XYZ
 2016-01-25 17:38:51 +00:00
Jorge Schrauwen
e4c511de4a update tests, we have a correct return now 2016-01-25 17:30:23 +00:00
Jorge Schrauwen
745f203ea3 unit test, better to test with unknown os_family, we expect "" result without patching cmd.run 2016-01-23 22:56:00 +00:00
Jorge Schrauwen
d153f43771 unit test was filling in fake os_familiy, new code skips the expensive cmd_run unknown os_family 2016-01-23 22:53:07 +00:00
twangboy
cec969db15 Fixed more tests 2016-01-22 19:24:38 -07:00
twangboy
aa47a2908f Fixed more lint 2016-01-22 19:20:24 -07:00
twangboy
3fcf9b4ba8 Fixed some lint 2016-01-22 19:15:29 -07:00
twangboy
e09f43b11b even more lint 2016-01-22 19:09:08 -07:00
twangboy
fef54563b0 More lint 2016-01-22 19:04:03 -07:00
twangboy
306d13a7fa Fixed tests 2016-01-22 17:36:48 -07:00
twangboy
1c58318013 Fixed tests 2016-01-22 17:32:42 -07:00
twangboy
88841e604f Fixed some tests 2016-01-22 17:27:18 -07:00
twangboy
6eb250a807 Fixed some tests 2016-01-22 17:20:25 -07:00
Mike Place
f27b602a0f Fix bad mock in win_service_test 2016-01-22 13:37:32 -07:00
Andrew Colin Kissa
f5aa107583 Add tests for data directory init and existance check 2016-01-22 12:15:45 +02:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Kris Raney
67f873b3c1 Merge branch 'develop' into boto_apigateway 2016-01-21 16:54:19 -06:00
Mike Place
40ba550ffd Merge pull request #30511 from kraney/boto_s3_bucket 
Boto s3 bucket state
 2016-01-21 15:52:58 -07:00
Kris Raney
5dfa264652 Merge branch 'develop' into boto_apigateway 2016-01-21 16:49:21 -06:00
Erik Johnson
ea0ca70187 Add git.list_worktrees unit test 2016-01-21 15:42:30 -06:00
Kris Raney
16e8b4f9e3 cut-and-paste error 2016-01-21 13:23:52 -06:00
Mike Place
0f5baa65ea Fix missing key in opts for event tests 2016-01-21 11:06:03 -07:00
Kris Raney
4ad20f6217 Not satisfied with the code complexity/ readability/ maintainability, so refactor a bit. Fix a couple bugs in the process. Add unit tests. 2016-01-21 11:28:53 -06:00
Kris Raney
917f48d19f Implement unit tests for boto_s3_bucket module 2016-01-21 11:25:55 -06:00
Quan Tong Anh
234faa5991 launchctl: update test function accordingly 2016-01-20 08:55:56 +07:00
justinta89
00943ff1e6 Boto uses False for is_default instead of None 2016-01-19 10:15:35 -07:00
justinta89
2f77152479 Boto uses False for is_default instead of None 2016-01-19 10:12:11 -07:00
rallytime
39b49621ad Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
 2016-01-14 13:33:53 -07:00
Winston Liu
a61cda5639 extended boto apigateway execution module to support overwriting of stage variables for a given api/stage. 2016-01-13 15:15:38 -08:00
Mike Place
c5d1365a36 Merge pull request #30331 from alprs/feature-patch_dir 
Make file.patch work with directories
 2016-01-13 14:34:58 -07:00
Mike Place
09b144aa98 Merge pull request #30327 from kraney/boto_cloudtrail 
Support for AWS CloudTrail
 2016-01-13 13:18:06 -07:00
Andreas Lutro
b73ee448f0 fix command args list 2016-01-13 20:59:10 +01:00
justinta89
ee764ee952 Updated seed_test.py for changes made to seed module 2016-01-13 11:58:05 -07:00
Andreas Lutro
d8b499b7c5 Make file.patch work with directories 
In the process, make the "hash" argument optional.

Closes #29619
 2016-01-13 19:15:21 +01:00
Kris Raney
8ab4938f48 Pylint fixes 2016-01-13 11:11:26 -06:00
Kris Raney
d30212f180 Add tag support to boto_cloudtrail 2016-01-13 10:13:05 -06:00
Mathieu Le Marec - Pasquet
22963e50f8 fix mysql tests 2016-01-13 10:12:53 +01:00
Kris Raney
549d0b8d8b Module functionality for support of state module 2016-01-12 15:19:31 -06:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Kris Raney
0d211a4fd5 Basic CloudTrail module 2016-01-12 13:13:19 -06:00
Mike Place
2c62b464b1 Accept whatever comes into hightstate mock for state tests 2016-01-12 11:30:25 -07:00
Mike Place
cf440036dd Remove unused import 2016-01-11 14:14:50 -07:00
Mike Place
36d55ea0ad Allow modules to be packed into boto utils 
A workaround to allow modules to be packed into the namespace for the boto utils.
 2016-01-11 14:13:07 -07:00
Winston Liu
a207fb44ce Merge branch 'boto_iot' into boto_apigateway 2016-01-08 10:08:04 -08:00
Mike Place
70681bf03b Fix for mock state PR #30118 2016-01-06 15:10:19 -07:00
Mike Place
3dd4d05a4b Merge pull request #30185 from cachedout/fix_30118 
Fix #30118
 2016-01-06 14:02:56 -07:00
Mike Place
180582a523 Fix for mock state PR #30118 2016-01-06 14:01:43 -07:00
Colton Myers
8bc5506c08 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/installation/rhel.rst
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/win_update.py
    salt/states/boto_elb.py
    salt/states/file.py
 2016-01-05 16:19:32 -07:00
Mike Place
5419699bd2 Merge pull request #30075 from iodatacenters/2015.8_gluster_usexml 
Convert glusterfs module to use xml
 2016-01-04 13:33:58 -07:00
Mike Place
fff6bf1970 Merge pull request #30041 from kraney/boto_iot 
Support for AWS IoT
 2016-01-04 13:04:06 -07:00
Joe Julian
01a8e7ee10 Convert glusterfs module to use xml 
The gluster cli has the option to produce xml output from most every
command, and to avoid pausing for questions when being run in script
mode. Make use of that capability and avoid scraping text output that is
often subject to change between versions.

This should help future-proof this module as any changes to the xml
output should be automatically integrated.

As part of this change, I added a glusterfs.info function and added the
force keywords to volume start and volume stop.

Fixes #30051
 2016-01-04 09:47:59 -08:00
Kris Raney
08987a1698 Fix new lint warning 2015-12-30 22:43:38 -06:00
Kris Raney
26ded33d79 Reproduced the no-boto problem and fixed it. 2015-12-30 22:08:35 -06:00
Kris Raney
1fb44b0925 Try again to deal with missing boto 2015-12-30 20:46:01 -06:00
Kris Raney
ee052615d1 Fix case when boto is not present 2015-12-30 16:34:58 -06:00
Mike Place
d09e69f3fc Merge pull request #30057 from abednarik/virtual_ret_parted_module 
modules.parted: __virtual__ return err msg.
 2015-12-30 08:57:55 -07:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
rallytime
f7e58a241c Merge branch '2015.5' into '2015.8' 
Conflicts:
- salt/modules/boto_vpc.py
- tests/unit/modules/boto_vpc_test.py
 2015-12-29 15:27:03 -07:00
abednarik
c1be5a61fa modules.parted: __virtual__ return err msg. 
Updated message when module is not supported based on systems or available binaries.
 2015-12-29 16:55:48 -03:00
Mike Place
e915f4b591 Merge pull request #30053 from akissa/add-postgres-privileges-support 
Add postgres privileges support
 2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
efcfb611b2 added postgres execution privileges tests 2015-12-29 10:59:48 +02:00
Winston Liu
f3697b972b unit tests for boto apigateway execution module, consistent naming of apiId -> restApiId 2015-12-28 16:24:57 -08:00
rallytime
1a83147986 Remove unnecessary import block 2015-12-28 16:14:13 -07:00
rallytime
695107ae6e Add some more unit tests for the vsphere execution module 
And fix a coupl of small bugs found in the module through testing
 2015-12-28 16:11:33 -07:00
Mike Place
5cfda08b39 Merge pull request #29970 from sjorge/module-zfs 
salt.modules.zfs
 2015-12-28 14:38:37 -07:00
Kris Raney
3dea1a3589 Sometimes 'no whitespace after comma' actually means 'no whitespace after _colon_'. 2015-12-28 15:14:27 -06:00
Kris Raney
2fe5d8fbb4 Fix pylint errors 2015-12-28 14:46:43 -06:00
Jorge Schrauwen
4bad71c60d lint fixes 2015-12-28 19:48:51 +00:00
Kris Raney
85d59865a6 Merge branch 'develop' into boto_iot 2015-12-28 13:45:35 -06:00
Stephen D. Spencer
e0da7cddf6 modules.pip: 
adjust (actual) current directory bits

tests.unit.modules.pip_test:
    adjust mock's expectations of cwd=None always being passed (?)
 2015-12-28 09:37:39 +00:00
justinta89
e706642152 Skipping some Boto tests until resolved moto issue 
Similar to #29725. Though, some of the tests are different, due to the older
branch. I'm not condisidering this a backport because of that.
 2015-12-27 22:34:09 -07:00
Jorge Schrauwen
e1445d42e9 update unit tests for new error messages 2015-12-26 10:28:25 +00:00
Jorge Schrauwen
bc15891944 added unit test for zfs.get 2015-12-24 00:07:36 +00:00
Jorge Schrauwen
59efba23aa added test for zfs.set 2015-12-23 23:22:09 +00:00
Jorge Schrauwen
87f27d206c added unit tests for zfs.snapshot 2015-12-23 22:44:19 +00:00
Jorge Schrauwen
0a1dbeda53 added unit tests for zfs.release, fixed unit test for zfs.hold 2015-12-23 22:06:44 +00:00
Jorge Schrauwen
9db9843bae added unit tests for zfs.hold 2015-12-23 21:50:01 +00:00
Jorge Schrauwen
596c991c0b added unit tests for zfs.holds 2015-12-23 21:16:45 +00:00
Kris Raney
c516e65333 Implement boto_iot module 2015-12-23 14:13:48 -06:00
Jorge Schrauwen
26c00bf402 added unit test for zfs.bookmark, probably need to revisit this once the error messages are more useful. Now they all seem to return unknown error from the upstream command 2015-12-23 20:12:07 +00:00
Jorge Schrauwen
f2dccea3d1 add unit test for zfs.promote 2015-12-23 17:19:34 +00:00
Jorge Schrauwen
b7314cd186 add unit test for zfs.clone 2015-12-23 17:06:22 +00:00
Jorge Schrauwen
032f17cfd1 implement unit tests for zfs.rollback 2015-12-23 16:48:24 +00:00
Jorge Schrauwen
c15affe227 add unit test for zfs.diff 2015-12-23 16:20:32 +00:00
Jorge Schrauwen
0d8fd711b5 add unit tests for zfs.inherit 2015-12-23 15:59:50 +00:00
Jorge Schrauwen
959828a9dd add unit tests for zfs.unmount 2015-12-23 15:36:33 +00:00
Jorge Schrauwen
11b986e715 unit test for zfs.list 2015-12-23 15:20:51 +00:00
Jorge Schrauwen
3cbc6befbe update unit tests for zfs.mount 2015-12-23 15:14:45 +00:00
Jorge Schrauwen
388f928851 unit test for zfs module should accept new output 2015-12-23 12:47:41 +00:00
Jorge Schrauwen
95a1668bc1 fix type in test data 2015-12-22 21:21:07 +00:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-12-22 08:05:49 -07:00
Mike Place
62c9514108 Merge pull request #29881 from sjorge/module_zpool 
rework salt.module.zpool
 2015-12-21 14:51:10 -07:00
Jorge Schrauwen
1ca3757782 tests now cover most commands that query data 2015-12-21 20:44:10 +00:00
Jorge Schrauwen
08b65e79ac add a few more unit tests 2015-12-21 20:40:28 +00:00
Jorge Schrauwen
37ac0df4e3 also test zpool.status 2015-12-21 20:19:03 +00:00
Jorge Schrauwen
21ee4b71b6 also do negative test 2015-12-21 20:07:48 +00:00
Jorge Schrauwen
28c4d28446 attempt to fix unit test 2015-12-21 19:49:40 +00:00
Mike Place
fa7dead492 Merge pull request #29901 from cachedout/fixup_29863 
Fixup 29863
 2015-12-21 11:26:00 -07:00
Mike Place
0d7ef0e95c Fix broken tests 2015-12-21 11:25:18 -07:00
Mike Place
23bffbb623 Merge pull request #29875 from akissa/add-postgres_language-state 
Add PostgreSQL Language management functionality
 2015-12-21 10:39:46 -07:00
Mike Place
4f46255044 Merge pull request #29856 from rallytime/esxi-unit-tests 
Added some initial unit tests for the salt.modules.vsphere.py file
 2015-12-21 10:12:20 -07:00
Andrew Colin Kissa
a826720371 Add PostgreSQL Language management functionality 
Fixes #29874
 2015-12-20 09:37:41 +02:00
rallytime
b908ebd123 Added some initial unit tests for the salt.modules.vsphere.py file 
More will follow to cover the remaining functions.
 2015-12-18 16:18:01 -07:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
 2015-12-18 15:00:24 -07:00
Erik Johnson
15047918a9 systemd test fixes 
This removes a bunch of tests that don't test anything (see https://github.com/saltstack/salt/issues/29852).

It also changes some of the tests to reflect recent changes in
systemd.py.
 2015-12-18 15:17:38 -06:00
Andreas Lutro
51088d938a add tests, rename a function to more closely mirror influxdb 2015-12-17 21:58:51 +01:00
Mike Place
aab929d196 Merge pull request #29718 from thusoy/issue-29423 
Support match-sets in iptables module
 2015-12-16 07:48:18 -07:00
Tarjei Husøy
387ac2ce5e Support match-sets in iptables module 
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426.

Added tests and fixed incorrect appending of the built rule.

Closes #29423.
 2015-12-15 16:35:06 -08:00
Mike Place
d19827fd3a Disable some boto tests per resolution of moto issue 
Pending resolution of https://github.com/spulec/moto/issues/493
 2015-12-15 14:59:14 -07:00
Mike Place
a2b1f41f49 Disable some boto tests per resolution of moto issue 
Pending resolution of https://github.com/spulec/moto/issues/493
 2015-12-15 14:57:52 -07:00
Colton Myers
5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/tls.py
    salt/states/git.py
    salt/transport/tcp.py
 2015-12-14 15:56:26 -07:00
Winston Liu
4235d17db9 renamed all exposed get_* execution functions to describe_* execution functions to be consistent with rest of the boto modules. 2015-12-14 13:36:10 -08:00
Winston Liu
d9cd07b32e Merge branch 'boto_lambda' into boto_apigateway 2015-12-11 17:11:06 -08:00
Winston Liu
4915c66c6c Merge branch 'boto_lambda' into boto_apigateway 2015-12-11 16:37:01 -08:00
Mike Place
8b336dc1b4 Merge pull request #29638 from cachedout/fix_29535 
Fix 29535
 2015-12-11 13:37:42 -07:00
Mike Place
5bda5ff664 Updated pip module internal check for log. 2015-12-11 13:36:51 -07:00
Mike Place
3514765d33 Merge pull request #29573 from kraney/boto_lambda 
An implementation of support for AWS Lambda
 2015-12-10 13:01:26 -07:00
Kris Raney
c024ca70b1 A few missed lint errors 2015-12-09 16:52:10 -06:00
Kris Raney
4e04c3fbbd Fix lint warnings, add log when using default region 2015-12-09 16:03:20 -06:00
Andreas Lutro
7c69c177ed update test 2015-12-09 13:18:47 +01:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07:00
Kris Raney
bda53f74a4 Full unit test coverage for lambda module 2015-12-08 13:33:28 -06:00
Winston Liu
7414ac89d4 few more unit tests to cover datetime conversion to string. 2015-12-08 10:24:31 -08:00
Kris Raney
f98791054e Lambda function unit test cases 2015-12-08 10:15:11 -06:00
Mike Place
95523312a0 Merge pull request #29512 from dr4Ke/fix_remount_cifs_uid_name 
Fix forced remount if uid/gid is provided as a name
 2015-12-08 09:08:33 -07:00
Christophe Drevet-Droguet
9a268e05d6 mount exec module: resolve user/group names in opts 
In relation to #25293, it solves the improbable case where the OS returns the
mount options as names instead of numeric ids. The module converts these names
to numeric ids before returning the opts.

This is done only for uid= and gid= opts, for now. It can be extended to others.
 2015-12-08 12:43:47 +01:00
Nicole Thomas
df90c406ba Merge pull request #29462 from techhat/genesispart 
Create partitioned, bootable images
 2015-12-07 19:28:24 -07:00
Winston Liu
37930ba471 unit tests for create, get, delete api completed. 2015-12-07 16:01:02 -08:00
Justin Findlay
99b229c9fe modules.genesis: update unit tests for bootstrap 2015-12-07 15:19:22 -07:00
Winston Liu
4f6a94fde0 updated unit test. 2015-12-07 13:33:00 -08:00
Mike Place
7efd6dd140 Merge pull request #29399 from jfindlay/second_up 
modules.status: add human_readable option to uptime
 2015-12-07 12:53:52 -07:00
Winston Liu
a413c3ea7c initial execution module unit tests for boto_apigateway. 2015-12-07 10:40:12 -08:00
Joseph Hall
bb6e2d5a8a Adding tests for disk.blkid 2015-12-07 08:52:06 -07:00
Christophe Drevet-Droguet
4a00cc5b70 cron: support for commented cron jobs 
This change is an implementation for managing commented cron jobs.

Before that, commented cron jobs were not manageable by salt. They were ignored
at reading, and thus lost while writing the new crontab.
This is described in issue #29082, which should be fixed now.

There is a new `commented` parameter, defaulting to False. The cron job is
set like any other, but is prefixed by `#DISABLED#`.
 2015-12-07 15:40:36 +01:00
Justin Findlay
48e7beb0eb modules.status: add in_seconds option to uptime 
Implements #29311.
 2015-12-04 18:52:59 -07:00
Justin Findlay
ca69a646d6 modules.genesis.bootstrap: update unit tests 2015-12-04 18:44:42 -07:00
Kris Raney
be58e095d4 Avoid leaving zip files scattered around after tests. 2015-12-04 14:23:40 -06:00
Mike Place
00cbcb9f3b Lint test case 2015-12-04 12:43:14 -07:00
Mike Place
0c6852e67d Fix augeas test 2015-12-04 08:37:01 -07:00
Kris Raney
6a208dca84 Start unit tests for boo_lambda 2015-12-03 21:09:48 -06:00
Mike Place
af1c327461 Fix augeas_cfg test 2015-12-03 13:54:43 -07:00
Mike Place
d2c0fcbc97 Merge pull request #29398 from cachedout/lint_29288 
Lint 29288
 2015-12-03 11:03:53 -07:00
Mike Place
3b0033e529 Lint #29288 2015-12-03 11:02:49 -07:00
Mike Place
17d80c051a Merge pull request #29334 from rallytime/bp-29237 
Back-port #29237 to 2015.8
 2015-12-02 12:37:31 -07:00
Mike Place
2607246686 Merge pull request #29321 from techhat/sparsegenesis 
Handle sparse files
 2015-12-02 12:36:28 -07:00
Mike Place
7b11eb0d67 Fixup test for #29321 2015-12-02 10:45:01 -07:00
Nicolas Delaby
dff6fa1fb2 Add execution module to manage docker volumes 2015-12-02 17:27:20 +01:00
Jorge Schrauwen
598226def1 fix unit test (attempt 1) 2015-12-02 08:34:59 -07:00
Mike Place
b96552b716 Merge pull request #29304 from sbz/monit-module-changes 
modules/monit: complete monit execution module functions
 2015-12-02 07:50:56 -07:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
 2015-12-01 15:31:03 -07:00
Sofian Brabez
a2e5586cd4 modules/monit: alias reload function also and fix lint issues 2015-12-01 21:42:56 +01:00
Justin Findlay
4d6c71aa80 modules.glusterfs: fix start_volume unit test 2015-12-01 10:53:32 -07:00
Sofian Brabez
539fd52220 modules/monit: complete monit execution module functions 
add new functions configtest(), id(), reload(), version() and validate()
to the monit execution module
 2015-12-01 17:33:52 +01:00
Jorge Schrauwen
cbded94f1a fix unit test (attempt 1) 2015-11-30 16:21:49 +00:00
Tim Harper
e060986828 add support to s3 for aws role assumption 2015-11-28 00:57:45 -07:00
Mike Place
89aee406fa Merge pull request #29153 from DSRCompany/features/3077_acl_limit_args 
ACL limit args
 2015-11-25 10:29:35 -07:00
Dmitry Kuzmenko
002b1ef9bd Fixed use of assert_has_calls in tests. 
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
 2015-11-25 15:31:20 +03:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Nicolas Delaby
17ff5c1ab5 Add expose networking to modules.dockerng 2015-11-24 13:55:22 +01:00
Mike Place
30d0e7a0c2 Merge pull request #29008 from k00mi/develop 
Make systemd service state less slow
 2015-11-19 14:54:48 -07:00
Justin Findlay
9a4959a42b systemd module: new unit test for available 2015-11-19 13:29:08 -07:00
John Schwinghammer
813f6e6808 Fix 'GPG_1_3_1 referenced before assignment' 
- Fix gpg.import_key() exception:
    "local variable 'GPG_1_3_1' referenced before assignment"
- Update the unit tests to test both the gpg.GPG_1_3_1=True and
gpg.GPG_1_3_1=False cases.
 2015-11-19 09:27:46 -06:00
Mike Place
b386bfa59d Merge pull request #28952 from rominf/hg_status_multiple_repos 
[modules/hg] hg.status: multiple repositories
 2015-11-18 11:35:29 -07:00
Colton Myers
d76d62877d Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/git.py
    salt/renderers/gpg.py
    salt/utils/__init__.py
 2015-11-17 16:24:43 -07:00