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
22,212 Commits 24 Branches 182 Tags 341 MiB
daa724a76a
Commit Graph

22212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
95a38461fe Moved all salt-cloud files into a subdirectory for move to Salt 
This is the simplest method of preserving the commit history for each
file from the salt-cloud repository, although the --follow flag must be
given to git log in order to view the full history.

This change allows for performing a regular git merge from within the
Salt repo without any merge conflicts occuring (since the salt_cloud dir
doesn't exist there).
 2013-11-08 11:22:10 -07:00
Thomas S Hatch
8431ccc038 Filter non return events 2013-11-08 11:21:03 -07:00
Thomas S Hatch
f076895365 Detect what minions are currently connected to the master 2013-11-08 11:02:04 -07:00
Mike Place
b42d508de0 Fileclient throwing exceptions 
In cases where where file_list_emptydirs() returned None, we'd throw an exception. This totally breaks the return output of things like cp.get_dir. This just catches the None and passes.
 2013-11-08 10:58:32 -07:00
Thomas S Hatch
f49a23e13b Merge pull request #8349 from hvnsweeting/develop 
BUGFIX: pass env the right way, because when use os.env way, LC_ALL will always be overriden in modules/cmdmod.py
 2013-11-08 09:49:09 -08:00
Thomas S Hatch
134640803c local port.... 2013-11-08 10:36:34 -07:00
hvnsweeting
a23e9c7b5c BUGFIX: pass env the right way, because when use os.env way, LC_ALL will 
always be overrided in modules/cmdmod.py
 2013-11-09 00:35:01 +07:00
Thomas S Hatch
83190a7640 Add function to quickly get addrs with ports 2013-11-08 10:27:46 -07:00
Joseph Hall
39d920825d Merge pull request #8348 from aptiko/nonrh-iptables 
Fix some errors in iptables
 2013-11-08 08:56:42 -08:00
Antonis Christofides
7c2cb470f3 Missing commas in salt.state.STATE_INTERNAL_KEYWORDS 2013-11-08 18:41:26 +02:00
Antonis Christofides
f4bea9a815 Fixed iptables on non-RedHat systems 
1aa4044a8a, among other things, made a change that results in "local
variable 'out' referenced before assignment" on all non-RedHat systems
that attempt to add an iptables rule. I don't understand the reason for
the change; most likely it was an error. Changing it back.
 2013-11-08 18:02:04 +02:00
Thomas S Hatch
24bcad08f5 Merge pull request #8345 from sabaini/issue_8338 
os grain should be ScientificLinux
 2013-11-08 07:32:46 -08:00
Thomas S Hatch
87d406e12c Fix bad ref to load 2013-11-08 08:26:14 -07:00
Peter Sabaini
636a1564c0 os grain should be ScientificLinux 2013-11-08 09:20:57 +01:00
Thomas S Hatch
a635b7c000 Module function to return active tcp connections 2013-11-07 17:10:30 -07:00
Thomas S Hatch
4c6063cc78 Merge pull request #8320 from s0undt3ch/issues/8196-environments 
Some more `saltenv` related changes/fixes
 2013-11-07 16:05:57 -08:00
Pedro Algarvio
9656f637f6 Add missing saltenv support. Thanks @hvnsweeting! 2013-11-08 00:05:24 +00:00
Pedro Algarvio
1f89f7f24d Add missing saltenv support. Thanks @hvnsweeting! 2013-11-08 00:05:24 +00:00
Pedro Algarvio
9ba91b49cf Add missing saltenv support. Thanks @hvnsweeting. 2013-11-08 00:05:23 +00:00
Pedro Algarvio
340ab1e482 Reference the current salt environment. Thanks @hvnsweeting! 2013-11-08 00:05:23 +00:00
Pedro Algarvio
759c55fadc Added saltenv support to salt.modules.apt. 
Removed unnecessary intermediary variables. Minor formatting changes.

Thanks for the pointers @hvnsweeting!
 2013-11-08 00:05:20 +00:00
Thomas S Hatch
0ca3a1093b Merge pull request #8332 from s0undt3ch/issues/__sls__-KeyError 
Take into account python types not just Yaml strings
 2013-11-07 16:01:16 -08:00
Thomas S Hatch
d4ddb8344d Merge pull request #8329 from cachedout/#8259 
Exception handling for missing id
 2013-11-07 15:59:39 -08:00
Thomas S Hatch
511a2e8aba nest return value so we can use top level metadata 2013-11-07 16:57:31 -07:00
Thomas S Hatch
921a5a99b2 Add chunk length to intermediate state events 2013-11-07 16:42:03 -07:00
Thomas S Hatch
9cd94a9bfb Merge pull request #8335 from basepi/syndic7671 
Fix for matching minions under syndics
 2013-11-07 15:39:19 -08:00
Thomas S Hatch
a90336ed92 delete tokens after use, saves some longer term memory 2013-11-07 15:51:49 -07:00
Colton Myers
d5221c8fd6 Add doc for syndic_wait config option 2013-11-07 15:41:04 -07:00
Colton Myers
91b03329e4 Process events even without 'id' in them 
This was breaking syndic matching.  The syndic would return its list of
expected minions, but that event does not have 'id' in it.  Thus, the
master would not process that event and it would either result in huge
delays for minion returns or the returns for minions under syndics
wouldn't appear at all on the CLI.
 2013-11-07 15:37:31 -07:00
Thomas S Hatch
4c97b8a2aa Invert the ip 2013-11-07 15:36:12 -07:00
C. R. Oldham
6a4eaef503 Merge pull request #8334 from cro/fix_4927 
Fix #4927  Now there is better support for FreeBSD and Mac OS X traceroute.
 2013-11-07 14:33:26 -08:00
C. R. Oldham
ba5e42869c Make network.traceroute work better on FreeBSD and MacOS X. 2013-11-07 15:28:22 -07:00
Thomas S Hatch
0220af4a12 Add routines to detect all open tcp connections very quickly 2013-11-07 15:19:05 -07:00
Pedro Algarvio
e687422a47 Since salt is now able to pass real types and not just yaml, take that into account. 
Refs the changes from #8289.
 2013-11-07 22:11:00 +00:00
Pedro Algarvio
77101231f2 Install a smaller and with less dependencies package. 2013-11-07 22:09:36 +00:00
Joseph Hall
3b4cf81766 Merge pull request #8330 from terminalmage/issue8321 
pkgrepo warnings/documentation improvements
 2013-11-07 13:02:21 -08:00
Erik Johnson
86cfc7fb99 Improve pkgrepo documentation 
Formatting fixes, as well as the addition of a recommendation to install
python-software-properties on Ubuntu.
 2013-11-07 14:55:10 -06:00
Erik Johnson
0a917dbed4 apt.py: clarify warnings when python-software-properties is absent 2013-11-07 14:54:24 -06:00
Mike Place
00c7d36966 Exception handling for missing id 
Refs #8259. We don't like tracebacks. Includes unit test.
 2013-11-07 11:59:07 -07:00
Thomas S Hatch
0a62a85a94 Set to the correct name 2013-11-07 11:31:51 -07:00
Thomas S Hatch
03cf380b84 Add test=True logic to aws sqs state per #8319 2013-11-07 11:31:06 -07:00
Thomas S Hatch
230f52e233 Merge pull request #8319 from scott-w/develop 
Add SQS states
 2013-11-07 10:28:21 -08:00
Seth House
16c12046e7 Merge pull request #8328 from s0undt3ch/develop 
Only load the module if the `aws` binary is found in `$PATH`.
 2013-11-07 10:25:31 -08:00
Pedro Algarvio
6ec69656e9 Only load the module if the aws binary is found in $PATH. 2013-11-07 18:23:15 +00:00
Thomas S Hatch
5baef7b3e3 pylint fixes 2013-11-07 11:02:53 -07:00
Seth House
4f00fa256b Fixed occurances of "Salt Stack" to SaltStack 2013-11-07 10:46:41 -07:00
Seth House
cf3df20aad Merge pull request #8323 from regilero/default-for-grains_filter_by 
Default for filter_by method in module grains
 2013-11-07 09:38:26 -08:00
Colton Myers
a59246a184 Merge pull request #8324 from terminalmage/minion-id-caching-fix 
Fix regression in minion ID caching
 2013-11-07 09:36:16 -08:00
Colton Myers
78662d270b Merge pull request #8325 from cachedout/#7860 
Add a dir_mode to file.managed
 2013-11-07 09:35:54 -08:00
Mike Place
2e6bf21635 Integration testing for file.managed dir_mode argument. 
Added documentation for dir_mode to file.managed.
 2013-11-07 10:19:16 -07:00