valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,262 Commits 24 Branches 182 Tags 341 MiB
10b8b45b52
Commit Graph

42262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nitin Madhok
cd72159533 Use shlex_quote from six 2014-11-19 14:06:51 -05:00
Colton Myers
f39fc22b2a Merge pull request #18271 from basepi/release2014.7.0 
Release 2014.7.0
 2014-11-19 11:37:32 -07:00
Colton Myers
c5dbb60403 Release 2014.7.0 2014-11-19 11:36:21 -07:00
jmdcal
5e2bbe363a fixed confusion 
Here it says clearly : http://salt-cloud.readthedocs.org/en/latest/topics/aws.html

EC2 instances can have a public or private IP, or both. When an instance is deployed, Salt Cloud needs to log into it via SSH to run the deploy script. By default, the public IP will be used for this. If the salt-cloud command is run from another EC2 instance, the private IP should be used.

my-ec2-config:
  # Specify whether to use public or private IP for deploy script
  # private_ips or public_ips
  ssh_interface: public_ips
 2014-11-19 12:32:07 -06:00
Jonathan Ballet
a6c3499749 Please pylint 
My patch #18221 yesterday introduced new Pylint warnings/errors.

This fixes these warnings.
 2014-11-19 19:28:28 +01:00
Jonathan Ballet
18a1e053d5 Fix undefined _error() function, thanks to Pylint 2014-11-19 19:23:13 +01:00
Nitin Madhok
eeca0d454a Removing unused import 2014-11-19 13:05:06 -05:00
Nitin Madhok
b93a4f6fd1 Cleaning up lint 2014-11-19 12:59:13 -05:00
Jonathan Ballet
56ef62b0a7 State debconf.set_file now accepts a template as a file 
It follows the same convention as `file.managed` for example.

This also introduces a new function in the `debconfmod` module to set the
Debconf selections from a template or, as before, from a simple file.

Fixes #7331
 2014-11-19 18:02:49 +01:00
Thomas S Hatch
23eeed8954 Merge pull request #18261 from cachedout/ext_note 
Add a note explaining salt/ext
 2014-11-19 09:56:56 -07:00
Mike Place
19783c1649 Add a note explaining salt/ext 2014-11-19 09:56:00 -07:00
Thomas S Hatch
e592a5a541 Add missign exception import 2014-11-19 09:45:28 -07:00
Thomas S Hatch
71e4473071 Merge branch 'salt-ssh-grains-fix' of https://github.com/slafs/salt into slafs-salt-ssh-grains-fix 
Conflicts:
	salt/client/ssh/wrapper/grains.py
 2014-11-19 09:44:53 -07:00
Thomas S Hatch
9860f189d4 Merge pull request #18247 from terminalmage/docs 
Add note about libssh2 optdepend for ssh access w/libgit2
 2014-11-19 09:40:52 -07:00
Thomas S Hatch
f010511d39 Merge pull request #18246 from jacksontj/develop 
Fix issue where startup of salt-master leaks memory
 2014-11-19 09:36:30 -07:00
Thomas S Hatch
7c4f739581 Merge pull request #18245 from s0undt3ch/hotfix/merge-18194 
Move `salt.utils.ipaddr` to `salt.ext.ipaddr` &  	Add `salt/ext/six.py` to COPYING
 2014-11-19 09:25:44 -07:00
Thomas S Hatch
488a194afb Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/seed.py
 2014-11-19 09:16:26 -07:00
Thomas S Hatch
a4dd2710b3 Merge pull request #18242 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-11-19 09:14:55 -07:00
Thomas Jackson
5c6d302359 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-11-19 08:10:12 -08:00
Sławek Ehlert
70b435d4b5 fix grains filter_by function when using salt-ssh 
very similar to #18238 and 7975b0a11
 2014-11-19 12:25:32 +01:00
Erik Johnson
d2b3da6bd7 Add note about libssh2 optdepend for ssh access w/libgit2 
See https://github.com/saltstack/salt/issues/15424#issuecomment-63493011
 2014-11-18 22:08:29 -06:00
Thomas Jackson
edc87aed19 Fix issue where startup of salt-master printed out "WARNING: Mixing fork() and threads detected; memory leaked." 
c2e96e moved the init of various classes around. While doing so all of the module class init was moved into the parent process (pre-fork), which means that if any modules create threads we will leak memory (at least)
 2014-11-18 18:39:28 -08:00
Pedro Algarvio
4c68c327ec Move salt.utils.ipaddr to salt.ext.ipaddr 2014-11-19 01:41:46 +00:00
Pedro Algarvio
ffbc38abe3 Add salt/ext/six.py to COPYING 2014-11-19 01:40:42 +00:00
Thomas S Hatch
b505c4bae6 Merge pull request #18239 from cachedout/seed_fix 
Quote args in seed
 2014-11-18 17:25:55 -07:00
Thomas S Hatch
e7823ce98b Merge pull request #18237 from cachedout/pkgutil_stderr 
No need to handle stderr/stdout when cmdmod will do it for you
 2014-11-18 17:25:03 -07:00
Thomas S Hatch
6a645e8911 Merge pull request #18234 from cachedout/pkgin_fix 
Use salty way to get environ
 2014-11-18 17:24:41 -07:00
Thomas S Hatch
873d1c1803 Merge pull request #18221 from multani/fix/git-config-set-shell-escape 
Fix Git's config set with values containing white spaces.
 2014-11-18 17:14:43 -07:00
Thomas S Hatch
7975b0a11c Merge pull request #18238 from slafs/salt-ssh-pillar-fix 
fix pillar get function when using salt-ssh
 2014-11-18 17:12:12 -07:00
Thomas S Hatch
30faaaf9e5 Merge pull request #18219 from s0undt3ch/hotfix/merge-18194 
Merge #18194 &  move `salt.utils.six` to `salt.ext.six`
 2014-11-18 17:10:14 -07:00
Thomas S Hatch
8a71736e6c Merge pull request #18240 from freimer/develop 
Add SSL/TLS option to profile
 2014-11-18 17:08:58 -07:00
Colton Myers
c505a2d3ff Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/at.py
	salt/modules/makeconf.py
	salt/modules/pacman.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
 2014-11-18 16:48:47 -07:00
Colton Myers
388ecbdd64 Merge pull request #18241 from basepi/deprecate_overstate 
Reorganize orchestration docs for state.over deprecation
 2014-11-18 16:42:05 -07:00
Colton Myers
87abfd307f Don't need the additional print, it will log to the CLI 2014-11-18 16:41:11 -07:00
Colton Myers
426c97282e Deprecating for Boron, not Beryllium 2014-11-18 16:39:01 -07:00
Colton Myers
453944dd74 Add more deprecation stuff to the state.over runner itself 2014-11-18 16:37:49 -07:00
Colton Myers
c0f7756153 Reorganize orchestration doc and deprecate overstate runner 2014-11-18 16:31:36 -07:00
Fred Reimer
657cf261aa Add SSL/TLS option to profile 2014-11-18 18:25:41 -05:00
Mike Place
48c4ab8c91 Quote args in seed 2014-11-18 16:16:10 -07:00
Thomas S Hatch
3858b3d45d Merge pull request #18232 from cachedout/pacman_fix 
Call shell with pacman
 2014-11-18 15:32:57 -07:00
Thomas S Hatch
027a6bd1ea Merge pull request #18231 from cachedout/openbsd_fixing 
fix openbsdservice
 2014-11-18 15:32:41 -07:00
Thomas S Hatch
fdf3ef2c33 Merge pull request #18228 from jfindlay/quote_yum 
more better sh handling in yumpkg mod
 2014-11-18 15:32:07 -07:00
Thomas S Hatch
bb972c780f Merge pull request #18224 from cvedel/issue-18136 
Fix for #18136
 2014-11-18 15:28:47 -07:00
Mike Place
69234155b9 No need to handle stderr/stdout when cmdmod will do it for you 2014-11-18 15:26:29 -07:00
Thomas S Hatch
378a9392d4 Merge pull request #18220 from cachedout/network_cleanup 
Network cleanup
 2014-11-18 15:25:27 -07:00
Colton Myers
2622d958c8 Merge pull request #18236 from basepi/publishcommentfix 
Fix comment location
 2014-11-18 15:25:14 -07:00
Thomas S Hatch
eea2ded859 Merge pull request #18218 from cachedout/makeconf_python_grep 
Native python searching instead of grep
 2014-11-18 15:24:57 -07:00
Thomas S Hatch
28f46d1007 Merge pull request #18215 from cachedout/gluster_quote_7 
Gluster quote
 2014-11-18 15:24:32 -07:00
Colton Myers
499a87e5c9 Fix comment location 2014-11-18 15:24:13 -07:00
Thomas S Hatch
e3d2518af2 Merge pull request #18213 from sumso/develop 
Update sqlite3.py to enable autocommit
 2014-11-18 15:23:49 -07:00