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
62,955 Commits 24 Branches 182 Tags 341 MiB
7918736656
Commit Graph

1718 Commits

Author SHA1 Message Date
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
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
Justin Findlay
99b229c9fe modules.genesis: update unit tests for bootstrap 2015-12-07 15:19:22 -07: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
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
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
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
Roman Inflianskas
ded2d46663 [modules/hg] hg.status: multiple repositories 2015-11-17 19:05:57 +03:00
Christoph Glaubitz
8639e3e9c3 closes #28784 
In fact this test will fail on the current code, but that is like
intended. This tests the fix of #28783, which was introduced in 2015.5.
 2015-11-16 20:30:37 +01:00
Justin Findlay
e32a9aab85 rh_service._chkconfig_is_enabled unit tests 2015-11-13 23:38:40 -07:00
Scott Walton
e9b84b35b4 Resolved merge conflict with upstream. 2015-11-11 16:38:31 +00:00
Scott Walton
e46d31d446 Amended the tests to remove the tab-check and still keep #28608 fixed 2015-11-11 16:32:56 +00:00
Colton Myers
8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/boto_secgroup.py
    salt/modules/rabbitmq.py
    salt/modules/win_system.py
    salt/modules/yumpkg.py
    salt/states/mount.py
 2015-11-09 17:05:43 -07:00
Colton Myers
c90431eddc Rip out unit test that doesn't apply anymore 
We now use -q with the command so we don't have to test our ability to
strip "Listing vhosts" out of the test
 2015-11-09 15:22:01 -07:00
Mike Place
759242a6ec Merge pull request #28671 from jfindlay/multi_mod 
implement multiple modules in the kmod state
 2015-11-07 19:11:52 -07:00
Justin Findlay
8524281f4e update kmod exec and state module unit tests 2015-11-07 16:04:23 -07:00
Steve Hajducko
455f40b0d2 Refactor etcd modules 
The etcd modules were using bits and pieces of python-etcd directly and
were using outdated exceptions to catch errors.  These errors were
causing issues when trying to use etcd modules for logic.

A summary of changes
    - Most of the 'work' is now done in etcd_util
    - Removed import of python-etcd from states/etcd_mod and the
      returner
    - Added new tests for etcd_util
    - Put in proper exceptions and catches for python-etcd
    - Added support for ValueError catching.  python-etcd doesn't
      support python 2.6 and raises ValueError when trying to format
      exceptions
    - Added watch function to etcd execution module
    - Added autospec to unit tests so hopefully less brittle
    - Added TTL and directory features to the set function

*BACKWARDS INCOMPATIBLE CHANGES*

All interfaces are still backwards incompatible.  However, the returns
from several of the etcd util functions have been changed.  The old
returns presented issues with certain test cases.  For instance, a
failed 'get' returned '', but a key with no value will also return ''.

The same issues occured with the 'ls', 'tree' and 'set' functions.  Trying to
ls a blank directory returned the same result as a failed ls of a
non-existent key.
 2015-11-06 16:29:50 -08:00
Scott Walton
540305dc99 Added test and fix for #28608. 2015-11-06 09:06:07 +00:00
Mike Place
81396927f8 Merge pull request #28605 from zigarn/a2xxconf 
Improvements on Debian-style apache utilities a2(en|dis)(mode|site|conf)
 2015-11-05 15:18:28 -07:00
Alexandre Garnier
f505b51ab1 Add module and state wrappers on a2enconf/a2disconf 2015-11-05 19:07:14 +01:00
Alexandre Garnier
39e1e6448b Simplify deb_apache.check_mod_enabled 
There is no 'default' with '000-' prefix for modules.
(Looks like a copy/paste from `check_site_enabled`)
 2015-11-05 17:52:42 +01:00