valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56,444 Commits 24 Branches 182 Tags 341 MiB
c7b5fccb9e
Commit Graph

2910 Commits

Author SHA1 Message Date
Pedro Algarvio
c7b5fccb9e Change cwd back to Salt's code dir 2015-07-28 12:22:53 +01:00
Pedro Algarvio
d649252878 Fix class reference 2015-07-28 10:33:08 +01:00
Pedro Algarvio
10c47647e3 Also rename the test module 2015-07-28 10:33:08 +01:00
Pedro Algarvio
143e8fa200 Let's call it for what it is! 2015-07-28 00:42:55 +01:00
Pedro Algarvio
63cecaddf4 Implement the Roster config schema 2015-07-28 00:42:55 +01:00
Pedro Algarvio
eabc84d93c Implemented RosterEntryConfig and added unit tests for it 2015-07-28 00:42:55 +01:00
Pedro Algarvio
ddf814174e Rename the config unit tests module 2015-07-28 00:42:54 +01:00
Justin Findlay
b3bed2d5d2 Merge pull request #25754 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-27 13:34:56 -06:00
Thomas S Hatch
6ebc61b0c8 Merge pull request #25734 from Unity-Technologies/wait-after-reboot 
Added a way to wait for a reboot to complete on Windows
 2015-07-27 11:47:03 -06:00
Pedro Algarvio
1010eef5ff Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-27 18:20:50 +01:00
Daniel Hobley
1ad9da30e5 Added a way to wait for a reboot to complete on Windows 
- This is useful if you have many states that are being run in a highstate and you don't want the rest of the states, running just before a reboot as this could lead to half complete states i.e installing software
 2015-07-27 14:16:02 +02:00
Thomas S Hatch
c30a1976c6 Merge pull request #25612 from arthurlogilab/state_postgresql_cluster 
[states] postgresql_cluster support (backed by the postgresql cluster modules)
 2015-07-24 10:34:11 -06:00
Arthur Lutz
555d7b867f pylint fixes 2015-07-23 09:02:44 +02:00
Arthur Lutz
5607957828 [states/postgresql_cluster] pylint fixes 2015-07-23 08:20:26 +02:00
Mike Place
41b760429a Merge pull request #25587 from cachedout/issue_16969 
Fix prereq in salt.state
 2015-07-22 14:05:02 -06:00
Colton Myers
2cb1189ff9 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/grains/core.py
 2015-07-22 12:17:58 -06:00
Colton Myers
c63ef2c7b2 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/modules/gem.py
    salt/modules/ssh.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/states/pkg.py
    salt/utils/__init__.py
    salt/utils/s3.py
 2015-07-22 12:05:50 -06:00
Mike Place
6f65fbdb82 Fix test 2015-07-22 11:43:19 -06:00
Mike Place
bc2321a5c6 Merge pull request #25595 from terminalmage/git_pillar-rewrite 
Bring git_pillar up to feature parity with gitfs
 2015-07-22 10:55:13 -06:00
Mike Place
3fe4a75a7f Merge pull request #25578 from davidjb/relative-includes 
Allow parent relative includes in state files
 2015-07-22 10:51:12 -06:00
Erik Johnson
123b8ee1cb Fix mock_open patch 
Forgot to add this when I removed the decorator in my previous commit.
 2015-07-22 11:09:15 -05:00
Erik Johnson
a1ffa0c1c4 More test fixes 2015-07-22 10:40:49 -05:00
Arthur Lutz
5f727fe8b2 [states] postgresql_cluster support (backed by the postgresql cluster modules) 
developped with David Douard <david.douard@logilab.fr> @douardda

closes #21293
 2015-07-22 17:39:08 +02:00
Erik Johnson
af82835f42 Move patching of mock_open to within test 
This keeps the tests from failing on platforms like RHEL6 where
unittest2 has no mock_open.
 2015-07-22 03:04:07 -05:00
Erik Johnson
73192390a2 Test fixes 2015-07-22 00:48:43 -05:00
David\ Beitey
9ad0ddc549 Allow parent relative includes in state files 
This implements the solution to #25477.  Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.

This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html),
which supported relative includes, excludes, and prefixed states.  This
PR expands on existing tests for stateconf.

This also updates the documentation accordingly.
 2015-07-21 16:32:38 +10:00
Colton Myers
7aef58b44f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-20 13:57:00 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
twangboy
5008bfee96 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again 2015-07-20 12:51:43 -06:00
twangboy
8b2dc681f9 Fixed the gem module to work on windows... without injection 2015-07-20 12:50:33 -06:00
Mike Place
89d595f002 Lint config_test 2015-07-20 11:18:31 -06:00
Pedro Algarvio
7c0ad43906 Another fix for flattened properties and test cases 2015-07-17 18:24:43 +01:00
Pedro Algarvio
85b191c4b9 Test case to make sure plain string requirements have the same outcome 2015-07-17 17:58:52 +01:00
Pedro Algarvio
6b09ec0c30 Fix requirements items since they broke with the previous 2 commits. 2015-07-17 17:23:17 +01:00
Pedro Algarvio
6e1ee65421 Test case for missing required entries when flattening Schemas 2015-07-17 17:23:07 +01:00
Justin Findlay
704b68b3f4 Merge pull request #25494 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-16 22:55:06 -06:00
Thomas S Hatch
7a0bb9df1e Merge pull request #25453 from isbm/isbm-libvirt 
Improving libvirt
 2015-07-16 14:26:03 -06:00
Pedro Algarvio
f8ee8c1ba9 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-16 20:08:28 +01:00
Pedro Algarvio
393a21117e Rename the module 2015-07-16 17:04:22 +01:00
Pedro Algarvio
42bfec8bb5 Let's call it for what it is! 2015-07-16 17:01:42 +01:00
Justin Findlay
40889d7d7e rewrite GPG unit tests 2015-07-16 09:37:37 -06:00
Joe Julian
1b7a56aa38 Add support for pyOpenSSL > 0.10 
Centos 6 doesn't provide a packaged version of pyOpenSSL > 0.10. Allow
the tls module to work with that minimum version. This will not allow
X509 extensions to work but will allow everything else.

Fixes #25384
 2015-07-15 16:49:54 -07:00
Ryan Lewis
a8abe21b1b Wildcard support for get_flags_from_package_conf 2015-07-16 08:19:02 +12:00
Bo Maryniuk
a35c84f40b Fix test for "stop" function 2015-07-15 19:03:48 +02:00
Bo Maryniuk
4040c82515 Fix test for "start" function 2015-07-15 19:03:37 +02:00
Bo Maryniuk
fa5163033e Fix test for "list_domains" function 2015-07-15 19:03:18 +02:00
Bo Maryniuk
63202ac3ec Rename 'list_vms' to 'list_domains' for consistent terminology 2015-07-15 13:09:12 +02:00
Bo Maryniuk
d55633b796 Fix tests for the virt state 2015-07-15 13:09:11 +02:00
Ryan Lewis
3b15a97c76 Add some unit tests for modules/portage_config.py 2015-07-15 14:46:10 +12:00
Jonathan Leroy
bc36d05c0c
Support for IPv6 addresses scopes in network.interfaces (ifconfig) 2015-07-15 01:14:32 +02:00