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
22,249 Commits 24 Branches 182 Tags 341 MiB
0bc956b940
Commit Graph

22249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
761f794123 Absorbed the salt-cloud index.rst document 2013-11-08 15:08:30 -07:00
Seth House
783cab927b Absorbed salt-cloud documentation contents into Salt's 2013-11-08 15:08:07 -07:00
Thomas S Hatch
2ab586c041 import salt.cloud.config as salt.cloud 2013-11-08 15:06:54 -07:00
Thomas S Hatch
5f39eacbc1 Merge pull request #8356 from cro/feature_8333 
Implement #8333, passthrough some Jinja config variables.
 2013-11-08 13:58:58 -08:00
C. R. Oldham
125559024f Propagate master config variables to the minion instead of using pillar ref. 2013-11-08 14:56:26 -07:00
Thomas S Hatch
e0b1a02ef1 Initial add of salt-cloud to setup.py 2013-11-08 14:47:41 -07:00
Thomas S Hatch
6205902600 Merge pull request #8359 from techhat/saltcloud 
Move saltcloud codebase into salt.cloud
 2013-11-08 13:45:10 -08:00
Joseph Hall
39e20c58b7 Change saltcloud imports to salt.cloud imports 2013-11-08 14:40:20 -07:00
Joseph Hall
36dc43493a Move saltcloud codebase into salt.cloud 2013-11-08 14:37:23 -07:00
Thomas S Hatch
0a1169d13c Merge pull request #8355 from s0undt3ch/features/docker-runtests 
Run the tests suite under a docker container
 2013-11-08 13:20:54 -08:00
Thomas S Hatch
e3e2a09c16 Merge pull request #8354 from s0undt3ch/develop 
Reintroduce the removed grains information
 2013-11-08 13:19:18 -08:00
Thomas S Hatch
da949b8b57 Merge pull request #8353 from ktenney/develop 
halite tutorial change tls.create_ca_signed_cert to create_self_signed_...
 2013-11-08 13:18:38 -08:00
Thomas S Hatch
803ddd9582 Merge pull request #8350 from cachedout/fileclient-emptydirs-fix 
Fileclient throwing exceptions
 2013-11-08 13:18:22 -08:00
Thomas S Hatch
5de4e73d4d Modernize the salt-cloud script 2013-11-08 14:11:27 -07:00
Thomas S Hatch
99bbf9ea9a Merge pull request #8358 from techhat/saltcloud 
Moving salt-cloud script into proper location
 2013-11-08 13:14:25 -08:00
Joseph Hall
62a8e31809 Pointing salt-cloud script to new correct location 2013-11-08 14:09:18 -07:00
Seth House
e4f638e6d7 Moved salt-cloud documentation into main docs dir 2013-11-08 14:08:36 -07:00
Joseph Hall
9f3fcfe64f Moving salt-cloud script into proper location 2013-11-08 14:08:34 -07:00
Thomas S Hatch
3ea0d77574 Merge salt-cloud requirements.txt 2013-11-08 14:06:15 -07:00
Thomas S Hatch
51efce6575 README is no longer material 2013-11-08 14:03:43 -07:00
Thomas S Hatch
4e93e6775d License is redundant, same apache 2.0 2013-11-08 14:02:40 -07:00
Thomas S Hatch
991c151cc2 Merge salt cloud authors files 2013-11-08 14:02:21 -07:00
Thomas S Hatch
57f52a8941 discard manifest.in for salt cloud 2013-11-08 13:53:11 -07:00
Thomas S Hatch
5d7649f23e Merge pull request #8352 from whiteinge/salt-cloud-merge-boohyah 
Salt cloud merge
 2013-11-08 12:47:18 -08:00
Pedro Algarvio
adda5c9f21 Include documentation about running the tests suite under a Docker container. 2013-11-08 20:44:49 +00:00
C. R. Oldham
236a1656d3 Implement #8333 2013-11-08 13:29:47 -07:00
Pedro Algarvio
dfab7aab73 Adapt the runtests parser to support running the tests suite under a Docker container. 2013-11-08 20:20:03 +00:00
Pedro Algarvio
148cef5772 Reintroduce the removed grains information. 
Removed on 4617a931be and 52be720d62.
 2013-11-08 19:53:43 +00:00
Pedro Algarvio
47ccaf959e Revert "Remove debugging pprint" 
This reverts commit 4617a931be.
 2013-11-08 19:53:38 +00:00
Pedro Algarvio
e8e19baf8d Revert "Remove unused grains lookup" 
This reverts commit 52be720d62.
 2013-11-08 19:53:29 +00:00
Pedro Algarvio
960118df29 Reintroduce the removed grains information. 
Removed on 4617a931be and 52be720d62.
 2013-11-08 19:50:38 +00:00
Pedro Algarvio
34ed606b0d Revert "Remove debugging pprint" 
This reverts commit 4617a931be.
 2013-11-08 19:39:30 +00:00
Pedro Algarvio
3b1f2126fb Revert "Remove unused grains lookup" 
This reverts commit 52be720d62.
 2013-11-08 19:39:12 +00:00
Thomas S Hatch
20837851f2 Hook intermitent minion connetion checking into the clean loop 2013-11-08 11:53:54 -07:00
Thomas S Hatch
1f890ea959 Add master local ip mapping to minion id checking 
This should allow the seq to find the id of a minion running on the master
 2013-11-08 11:51:39 -07:00
Kent Tenney
9bfb7703c5 halite tutorial change tls.create_ca_signed_cert to create_self_signed_cert 2013-11-08 12:46:25 -06:00
Seth House
36aa3492ce Merge the entire salt-cloud repository into the salt repository 
Note, in order to view the full history of a salt-cloud file you must
pass --follow to git log.
 2013-11-08 11:28:17 -07:00
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