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
5,273 Commits 24 Branches 182 Tags 341 MiB
bdb4055ce2
Commit Graph

5273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Colish
edfb3d2560 Merge branch 'develop' of git://github.com/saltstack/salt into develop 
Conflicts:
	tests/unit/utils/find_test.py
 2012-06-30 12:46:04 -07:00
Thomas S Hatch
582d0e15fe Merge branch 'develop' of github.com:saltstack/salt into develop 2012-06-30 13:42:00 -06:00
Thomas S Hatch
27b5da0f82 initial addition of event system minion module 2012-06-30 13:41:14 -06:00
Thomas S Hatch
e285aa8d5c change msg to data for consistency 2012-06-30 13:40:43 -06:00
Jeff Schroeder
7e16fd680a Merge branch 'develop' of github.com:saltstack/salt into develop 2012-06-30 12:34:41 -07:00
Jeff Schroeder
07b4c8b4ed Skip the rvm and gem module/state tests when mock is missing 
The mock python module is required for the gem and rvm tests.
If it is not available, the tests should be gracefully skipped.

From python runtests.py -u:

test__check_and_install_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_rvm (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_gemset_present (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test_removed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test__rvm (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__rvm_do (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list_all (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_install (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__gem (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_sources_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
 2012-06-30 12:29:48 -07:00
Dan Colish
78d16a28f0 Move tmp hosts file management to test case which requires it. Fix 
test.unit.utils.find_test on OSX
 2012-06-30 12:20:53 -07:00
Thomas S Hatch
65d8cb4e59 Merge pull request #1521 from dcolish/develop 
Fix host file setup and fix tests.integration.states.host
 2012-06-30 12:00:05 -07:00
Thomas S Hatch
8748414b21 Merge pull request #1520 from mattrobenolt/fix-ssh-module-tests-vagrant 
Hardcode /tmp/subsalttest dir in ssh module integration tests
 2012-06-30 11:55:47 -07:00
Dan Colish
f79b6e5ea0 Fix host file setup and fix tests.integration.states.host 2012-06-30 11:47:48 -07:00
Joshua Elsasser
0ecdac79a6 Add OpenBSD support to disk module. 2012-06-30 11:46:58 -07:00
Matt Robenolt
57ff2bfe3e Hardcode /tmp/subsalttest dir in ssh module integration tests 
I don't really like doing this, but `/tmp/subsalttest dir` is already
hardcoded in other places for running tests.

Without this, when running tests under a mounted Vagrant drive,
`ssh-keygen` doesn't have permission to create the symlink for
known_hosts to known_hosts.old, causing a test to fail.

```
======================================================================
FAIL: test_rm_known_host (integration.modules.ssh.SSHModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/vagrant/tests/integration/modules/ssh.py", line 143, in
test_rm_known_host
    self.assertEqual(ret, 'add')
AssertionError: 'exists' != 'add'
```

`link /vagrant/tests/integration/tmp/known_hosts to
/vagrant/tests/integration/tmp/known_hosts.old: Operation not permitted`
 2012-06-30 11:46:31 -07:00
Larry Price
77f54af75e Merge branch 'develop' of https://github.com/saltstack/salt into develop 2012-06-30 11:43:49 -07:00
Larry Price
994d62431e found the issue, set cwd. 2012-06-30 11:43:32 -07:00
Thomas S Hatch
0911c130a7 Add master side event evaluation 2012-06-30 12:39:51 -06:00
Larry Price
4edefcdfec Merge branch 'develop' of https://github.com/saltstack/salt into develop 2012-06-30 11:23:51 -07:00
Thomas S Hatch
7424738dc9 Merge pull request #1519 from intchanter/develop 
Remove 'DO NOT EDIT', as distros copy as-is.
 2012-06-30 11:19:05 -07:00
Intchanter
5f98f6cc83 Remove 'DO NOT EDIT', as distros copy as-is. 2012-06-30 12:14:58 -06:00
Joshua Elsasser
55ef003cd2 Gather biosversion, manufacturer, productname and serialnumber grains on OpenBSD. 2012-06-30 11:13:08 -07:00
Jeff Schroeder
27bba6ad0c Merge pull request #1518 from laprice/develop 
Tenants rent your property. Tenets are are principles that you uphold.
 2012-06-30 10:48:38 -07:00
Thomas S Hatch
8f8597d91f Merge pull request #1517 from baijum/sprint 
Fix various issues with `is_replication_enabled`
 2012-06-30 10:12:21 -07:00
Baiju Muthukadan
fa6b8b989c Fix various issues with is_replication_enabled 
- `_is_master()` is global function
- `is_none()` was not defined (use is None)
- s/replication_enabled/enabled
 2012-07-01 03:54:59 +05:30
Larry Price
55a145e862 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2012-06-30 10:00:48 -07:00
Thomas S Hatch
e01a4c2d26 Merge pull request #1516 from baijum/sprint 
ignore 'tmp' directory created by integration test
 2012-06-30 09:49:50 -07:00
Baiju Muthukadan
4668e2c5d8 ignore 'tmp' directory created by integration test 2012-07-01 03:46:43 +05:30
Larry Price
aa95c9d26b initial test case for user. 2012-06-30 09:43:44 -07:00
Larry Price
c2f89a849d adding state tests to the full run :-/ 2012-06-30 09:40:00 -07:00
larry
919f1e5b29 Tenants rent your property. Tenets are are principles that you uphold. 2012-06-30 06:25:06 -07:00
Bret Palsson
bb4f0f3e95 Fixed bonding issues. 
- Load bonding kernel module when creating a bond
- Only add bonding options to bonding master interface
- Only create a modprobe.d conf file for bonding master interface
- Reordered interface template
- Fixed vlan entry in interface template
 2012-06-29 23:08:11 -06:00
Thomas S Hatch
0c66239842 Merge pull request #1513 from wilkystyle/develop 
Develop
 2012-06-29 09:53:33 -07:00
Mike Wilkerson
6805eae79a fixed globbing when no minions are found 2012-06-29 12:47:33 -04:00
Mike Wilkerson
a8d3ac3de1 Merge remote-tracking branch 'upstream/master' into develop 2012-06-29 12:15:13 -04:00
Thomas S Hatch
f922152bfc Spelling error in state module 2012-06-28 22:10:53 -06:00
Thomas S Hatch
df0dfc4638 Merge pull request #1511 from peacetara/patch-2 
The function appears to be called run now, and not sls.
 2012-06-28 14:18:09 -07:00
Thomas S Hatch
1ba7629bc0 Merge pull request #1510 from peacetara/patch-1 
Adding 'Running and debugging salt states' section.  That shows off the ...
 2012-06-28 11:54:42 -07:00
peacetara
3aaad890ca The function appears to be called run now, and not sls. 2012-06-28 11:53:54 -07:00
peacetara
2f54587cbc Adding 'Running and debugging salt states' section. That shows off the salt-call command, to help you debug. Also shows you how in the world to run a .sls file, which is always a good thing :) 2012-06-28 11:51:25 -07:00
Thomas S Hatch
8e51797e0f Add makedirs support to file.rename 
Fix #1447
 2012-06-27 17:58:37 -06:00
Thomas S Hatch
b9b0a36b07 Add file.rename 2012-06-27 16:42:19 -06:00
Thomas S Hatch
1d6b929d5b Jeff wanted more comments :P 2012-06-27 16:02:05 -06:00
Thomas S Hatch
e15957e975 Fix rare issue when watch is used but not supported 2012-06-27 15:27:00 -06:00
Thomas S Hatch
f9c3facbed it would only check one before 2012-06-27 13:47:58 -06:00
Thomas S Hatch
1f1354440b Add a cmd.script state 
So that scripts can be executed dierctly from the master, Fix #1486
 2012-06-27 12:37:59 -06:00
Thomas S Hatch
44a40b7072 fix docstring spelling error 2012-06-27 12:13:33 -06:00
Thomas S Hatch
0d8876f68b Fix #1454 2012-06-27 10:57:27 -06:00
Thomas S Hatch
eb0f5873e0 Fix #1460 2012-06-27 10:32:48 -06:00
Thomas S Hatch
febd81d65d Hook verify_socket function into the master startup 
Fix #1452
 2012-06-27 10:27:32 -06:00
Thomas S Hatch
551a788ea9 Add verify_socket method 2012-06-27 10:26:58 -06:00
Thomas S Hatch
1b13c2c155 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-06-27 09:10:50 -06:00
Thomas S Hatch
33646d77a8 Fix #1505 2012-06-27 09:09:58 -06:00