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
61,884 Commits 24 Branches 182 Tags 341 MiB
4324189658
Commit Graph

5977 Commits

Author SHA1 Message Date
Mark McGuire
4324189658 add deserializer test, fix deserialization 2015-11-15 14:14:42 -06:00
Mark McGuire
53dd9ae138 Add configparser serializer 
* move "python" serializer to serializers
* make salt.states.file.serializer load serializers from salt.serializers
 2015-11-15 14:04:27 -06:00
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -07:00
Mike Place
785bf94f55 Add transport setting to shell test 2015-11-12 14:32:39 -07:00
Mike Place
8d3244166b Cast to dict to fix wheel tests in tcp 2015-11-12 12:21:52 -07:00
Colton Myers
224602437a Merge pull request #28804 from cachedout/tcp_test_fixes 
TCP test fixes
 2015-11-12 11:39:25 -07:00
Todd Tomkinson
ba94878f45 marathon and chronos proxy minions 2015-11-12 10:03:38 -07:00
C. R. Oldham
2ad01fe7a2 Merge pull request #28778 from toddtomkinson/marathon_chronos_proxy_minions 
marathon and chronos proxy minions
 2015-11-12 08:07:21 -07:00
Mike Place
9b18f372e6 Normalize IPC check among transports 2015-11-11 16:26:32 -07:00
rallytime
e2b0fee57e Don't change perms list, only existing perms should be a dictionary. 
Refs #28269
 2015-11-11 12:31:51 -07:00
rallytime
7601647d69 Revert "rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list." 
This reverts commit 07482211eb.
 2015-11-11 12:23:17 -07:00
Todd Tomkinson
f6ccc0e250 marathon and chronos proxy minions 2015-11-11 10:51:28 -07:00
rallytime
07482211eb rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list. 
Refs #28269
 2015-11-11 09:45:35 -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
87365212b4 Merge pull request #28723 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-11-10 11:26:29 -07:00
Mike Place
590f503fb8 Merge pull request #28748 from tinyclues/cors_url_with_arguments 
[Saltnado] - Add support for CORS preflight request for parametrized urls
 2015-11-10 11:24:30 -07:00
FELD Boris
049815fb34 Add support for cors preflight request for parametrized urls 
The implementation was broken for jobs and minions handlers
 2015-11-10 18:37:03 +01: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
26fd2bc89e Merge pull request #28215 from s0undt3ch/features/signal-handling 
Proper signal handling
 2015-11-09 12:11:15 -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
rallytime
cded9ac01d Merge branch '2015.8' into 'develop' 
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
 2015-11-06 09:34:31 -07:00
Pedro Algarvio
058cd00aea Name some more runtests daemon processes 2015-11-06 13:15:12 +00:00
Pedro Algarvio
9dc5533fae Name the test daemon processes for ps output 2015-11-06 13:15:12 +00: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
Nicole Thomas
b5a89927f0 Merge pull request #28594 from rallytime/merge-develop 
Merge branch '2015.8' into develop
 2015-11-05 14:47:42 -07:00
Alexandre Garnier
f505b51ab1 Add module and state wrappers on a2enconf/a2disconf 2015-11-05 19:07:14 +01:00
rallytime
62d688d720 Fix mock patch module name 2015-11-05 10:45:30 -07:00
rallytime
3bcd068f6a Update cloud vmware unittests to utilize the salt.utils.vmware.py file 2015-11-05 10:02:05 -07:00
Alexandre Garnier
2e6cf66d80 Add apache_site state (like apache_module) 
Allow to enable/disable Debian-style sites with `a2ensite`/`a2dissite`.
 2015-11-05 17:52:42 +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
Mike Place
9a08e4c1dd Merge pull request #28562 from jirikotlin/develop 
Test True support for INI state module.
 2015-11-05 09:01:50 -07:00
Jiri Kotlin
eb19140cc5 INI test compliancy - modified ini_manage_test.py 2015-11-05 13:49:05 +00:00
rallytime
eec9d69387 Merge branch '2015.5' into '2015.8' 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/file.py
	tests/integration/__init__.py
 2015-11-04 15:52:59 -07:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Mike Place
7ca7ed4b37 Merge pull request #28579 from jfindlay/virt_ret 
fix __virtual__ returns: tls,uptime mods
 2015-11-04 15:00:02 -07:00
Justin Findlay
333c132378 fix __virtual__ returns: tls,uptime mods 2015-11-04 13:10:38 -07:00
Mike Place
ec924e8410 Merge pull request #28560 from bdrung/2015.8 
Fix various typos
 2015-11-04 08:06:36 -07:00
Mike Place
bdd5274c55 Merge pull request #28505 from plastikos/improvement-minio_process_grains 
Add grains/minion_process.py - grains describing the minion process
 2015-11-04 07:40:05 -07:00
Benjamin Drung
470e82f17f Fix typo an dictionnary -> dictionary 2015-11-04 11:06:09 +01:00
Justin Findlay
11a9a5868f simplify timezone module unit test mocks 2015-11-03 19:37:54 -07:00
Justin Findlay
476b651c94 update timezone module unit tests for timedatectl 2015-11-03 19:34:01 -07:00
Thayne Harbaugh
3bedbb713b Use "test.versions" instead of "-g" (pid in grains changes). 
integration.shell.call.test_issue_15074_output_file_append test just needs any
output that is repeatable.  Previously it used the grains output ("-g"
argument).  Unfortunately grains now includes the PID which changes for each
invocation of "salt-call" and is therefore not predictably comparable.  Use
"test.versions" that should have constant output across multiple invocations.
 2015-11-03 14:10:37 -07:00
twangboy
0da6ff7c50 Fixed some logic 2015-11-03 10:09:49 -07:00
Thayne Harbaugh
ab09d08c99 Expand test integration.modules.grains to check for new minion process grains. 2015-11-03 00:14:32 -07:00
Colton Myers
422c641233 Remove test failing because of mocks -- it's deprecated anyway 2015-11-02 19:42:01 -07:00