valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,481 Commits 24 Branches 182 Tags 341 MiB
70e1e1549a
Commit Graph

18481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Healy
6f4f1df37f minor typo 2013-09-28 21:43:07 +10:00
Pedro Algarvio
e194a9fabe Merge pull request #7494 from s0undt3ch/issues/7409-no-new-line-ssh-keys 
Make sure there's a line break before writing new key
 2013-09-28 03:07:43 -07:00
Pedro Algarvio
923064499c Merge pull request #7487 from s0undt3ch/hotfix/arg-lookup-duplicates 
Don't include `kwargs` entries in `args`.
 2013-09-28 03:05:36 -07:00
Joseph Hall
092cfc6324 Merge pull request #7497 from cvrebert/patch-1 
copyedit SaltStack Packaging Guide
 2013-09-27 17:41:51 -07:00
Chris Rebert
b9a43b6a17 copyedit SaltStack Packaging Guide 2013-09-27 17:37:42 -07:00
Erik Johnson
51a28837cb Fix regression in wildcard includes 
Resolves #7455.
 2013-09-27 19:36:39 -05:00
Joseph Hall
2c83d092e4 Merge pull request #7496 from jthigpen/fix-unmount-documentation 
Fix minor documentation bug in states.mount.unmount
 2013-09-27 16:44:55 -07:00
James Thigpen
a900cd996d Fix minor documentation bug in states.mount.unmount 2013-09-27 16:41:41 -07:00
Pedro Algarvio
ec07e5ae49 Adapt test cases to fixed behaviour. 2013-09-28 00:00:59 +01:00
Pedro Algarvio
c61b835d77 Docstring formatting to style guide. 2013-09-28 00:00:59 +01:00
Pedro Algarvio
9b3d504e03 Fix unit tests regarding salt.utils.find._parse_interval 2013-09-28 00:00:59 +01:00
Pedro Algarvio
0665d9708f format_call_defaults is not necessary since it the same as arg_lookup. 
Fixed arguments popping order.
 2013-09-28 00:00:59 +01:00
Pedro Algarvio
94ddf88eb6 Don't include kwargs entries in args. 2013-09-28 00:00:59 +01:00
Pedro Algarvio
9a9990a0aa Remove any trailing white space. 2013-09-28 00:00:26 +01:00
Pedro Algarvio
e7ddf159a1 Make sure there's a line break before writing new key. Fixes #7409. 2013-09-28 00:00:26 +01:00
Pedro Algarvio
2f3ed58541 Add test case which verifies the occurrence of #7409. 2013-09-28 00:00:25 +01:00
Pedro Algarvio
b8c58de858 Merge pull request #7495 from terminalmage/issue7361 
Service state fixes
 2013-09-27 15:59:56 -07:00
Erik Johnson
b7c1e21b44 Fix reporting for service.dead states 
service.dead states for which the "enable" param is not set to True or
False, if a service is stopped as a result of running the state, did not
have anything in the changes dict, and also had an empty comment field.
This commit improves those reporting deficiencies.

In addition, the helper function _available() in salt/states/service.py
has been modified slightly. There is no reason to add a key to the
return dict, then pop it off after running _available(). This has been
changed so that _available() returns True/False, and the refs to this
function have been changed to not pop the now-nonexistant key from the
return dict.
 2013-09-27 17:14:43 -05:00
Erik Johnson
338cb06d78 Add "available" functions to service providers 
These functions make service states more reliable, and and fix edge
cases when a provider override is used and the the overriding provider
doesn't have an available function (and this falls back to using the
default one from the detected service module).
 2013-09-27 17:09:15 -05:00
Thomas S Hatch
e7b5f6cee1 Add packaging convention document 2013-09-27 15:38:54 -06:00
Pedro Algarvio
9f4d08daa6 Fix argument popping when formatting call. 2013-09-27 22:34:12 +01:00
Joseph Hall
bdce0076f1 Merge pull request #7492 from cvrebert/patch-1 
client/ssh/wrapper/config.py: rm unused import of urllib2
 2013-09-27 13:18:50 -07:00
Pedro Algarvio
cb721b4356 Merge pull request #7490 from aboe76/update_suse_pkg 
updated suse spec to salt 0.17.0
 2013-09-27 13:16:36 -07:00
Chris Rebert
9116ddb99f client/ssh/wrapper/config.py: rm unused import of urllib2 
************* Module salt.client.ssh.wrapper.config
salt/client/ssh/wrapper/config.py:9: [W0611(unused-import), ] Unused import urllib2
 2013-09-27 13:10:56 -07:00
Niels Abspoel
4677b0a2c0 updated suse spec to salt 0.17.0 
created salt-ssh as a separate package
improved dependencies per package
salt-master depends pyzmq and recommends halite
salt-minion depends pyzmq
salt dependency pyzmq removed.
 2013-09-27 21:58:18 +02:00
Joseph Hall
57c97001e8 Merge pull request #7489 from s0undt3ch/hotfix/lint 
Fix PEP-8 `E261`.
 2013-09-27 10:44:20 -07:00
Pedro Algarvio
e030352ad1 Fix PEP-8 E261. 2013-09-27 18:31:34 +01:00
Thomas S Hatch
e8f934daa1 Merge pull request #7488 from ranl/modjk 
docfix for modjk bulk functions
 2013-09-27 10:10:02 -07:00
ranl
44d66f185e docfix for modjk bulk functions 2013-09-27 20:02:27 +03:00
Pedro Algarvio
2d43e82274 Merge pull request #7486 from s0undt3ch/hotfix/lint 
Lint, indentation, minor formatting fixes
 2013-09-27 09:28:23 -07:00
Pedro Algarvio
1cead192eb Fix indentation and some minor formatting. 2013-09-27 16:37:45 +01:00
Pedro Algarvio
72986d789b Fix indentation, a bad variable and some formatting. 2013-09-27 16:32:51 +01:00
Pedro Algarvio
caba0c8be9 It's log.warning not log.warnings 2013-09-27 16:24:35 +01:00
Thomas S Hatch
f7628be386 Merge pull request #7485 from s0undt3ch/hotfix/zmq-version-info 
Keep ZMQ version checking simple.
 2013-09-27 08:09:18 -07:00
Pedro Algarvio
c50e417892 Keep ZMQ version checking simple. 2013-09-27 16:06:03 +01:00
Thomas S Hatch
334407f2ba Merge pull request #7476 from terminalmage/issue7452 
Pass through the env to file.patch state
 2013-09-27 08:02:32 -07:00
Thomas S Hatch
bd846ffdbb Merge pull request #7264 from holmboe/esxi-init 
Introduce disk profiles and enable virt.init on an ESX host
 2013-09-27 08:02:11 -07:00
Thomas S Hatch
3f0b151bda Merge pull request #6968 from s0undt3ch/features/6962-extra-state-kwargs-error 
State calls now fail if non-supported arguments are used. Fixes #6962.
 2013-09-27 08:01:13 -07:00
Thomas S Hatch
427477c67b Merge pull request #7464 from evinrude/develop 
Refactor: Symlink functionality for state file.recurse
 2013-09-27 07:59:34 -07:00
Thomas S Hatch
ed37b9acfe Merge pull request #7484 from joehealy/salt-ssh-packaging-fix-2 
Dereferenced symbolic links when creating thin.tgz
 2013-09-27 07:58:43 -07:00
Joe Healy
53732e97c2 Dereferenced symbolic links when creating thin.tgz 2013-09-27 23:13:46 +10:00
Henrik Holmboe
5324d6a7eb Two integration tests for virt.get_profiles 
This will test the default NIC and disk profiles for KVM and ESX.
 2013-09-27 01:41:52 +02:00
Thomas S Hatch
8267957ad6 Merge pull request #7478 from basepi/zmqwarn 
Show ZMQ version warning for < 3.2  (rather than < 3)
 2013-09-26 16:40:36 -07:00
Colton Myers
e53820a982 Show ZMQ version warning for < 3.2 (rather than < 3) 2013-09-26 17:39:40 -06:00
Henrik Holmboe
3149499765 Add unit tests 
In addition to custom ESX profile, test:

 - default KVM profile
 - default ESX profile
 - custom KVM profile
 2013-09-27 01:39:07 +02:00
Thomas S Hatch
be15c3e91c Add a few more notes to the release notes 2013-09-26 17:34:09 -06:00
Henrik Holmboe
7ec34af486 Refactor profile loading to use YAML 
This is done in order to more easily test configuration syntax errors,
as the the minion configuration file uses YAML.
 2013-09-27 01:11:28 +02:00
Erik Johnson
2e20401302 Pass through the env to file.patch state 
Fixes #7452.
 2013-09-26 17:59:23 -05:00
Henrik Holmboe
008a1b7fc9 Compatibility import for ElementTree 2013-09-27 00:58:17 +02:00
Henrik Holmboe
a8d258cefc Use StringIO from salt._compat 2013-09-27 00:45:27 +02:00