valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,339 Commits 24 Branches 182 Tags 341 MiB
6cd183b690
Commit Graph

23339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
6cd183b690 Merge pull request #9020 from ouiea/fix-gem-rvm-with-another-user 
Fixes issue #8951 - gem install fails when rvm is set up with another us...
 2013-12-05 13:51:01 -08:00
Pedro Algarvio
b5513395f3 Don't rely on salt.utils.is_windows(), it fails at install time under windows. 2013-12-05 20:54:33 +00:00
Pedro Algarvio
9226f98bfe Let's include Salt Cloud to avoid circular import issues in Windows. 2013-12-05 20:46:35 +00:00
Thomas S Hatch
d135dc0239 Merge pull request #9019 from blackduckx/develop 
Support Oracle Linux 5.x
 2013-12-05 12:05:50 -08:00
pyinx
7c20dd12b2 add saltstack state: memcached 2013-12-05 12:44:07 -07:00
pyinx
8e4345266a add saltstack module: memcached 2013-12-05 12:44:00 -07:00
linuxme
fd074dc57e Update mysql.py 
change ' to `
 2013-12-05 12:43:55 -07:00
linuxme
9c75f6c848 Update mysql.py 
modify ''alter_time' TIMESTAMP DEFAULT CURRENT_TIMESTAMP' to ''alter_time' TIMESTAMP DEFAULT CURRENT_TIMESTAMP,'
 2013-12-05 12:43:48 -07:00
linuxme
84da3ab2ac Update mysql.py 
added the 'alter_time' column to the table 'salt_returns'
This column is convenient for us filtering SQL statements in a given time period and help us determine whether a statement execution success on some minions.
 2013-12-05 12:43:41 -07:00
Thomas S Hatch
018a2d9c99 Merge pull request #9011 from Jorge-Rodriguez/develop 
Catch os.error instead of all Exceptions
 2013-12-05 11:44:28 -08:00
Thomas S Hatch
f65887cbda Merge pull request #8993 from olliewalsh/eventtest 
Another unit test for events
 2013-12-05 11:39:33 -08:00
Thomas S Hatch
4fb92c78c9 Merge pull request #9054 from SmithSamuelM/sam_20131202 
Enable manage.present to work on non linux but unix os like os x where /proc is not available
 2013-12-05 11:39:19 -08:00
Thomas S Hatch
2c92aab445 Merge pull request #8991 from terminalmage/issue5392 
Allow editable=. for pip.install
 2013-12-05 11:38:21 -08:00
David Boucha
2bbad9a259 Merge pull request #9056 from s0undt3ch/develop 
Don't trigger the name resolution at import time. Fixes install on Windows machines.
 2013-12-05 11:26:10 -08:00
Pedro Algarvio
fcdf6473b7 Don't trigger the name resolution at import time. Fixes install on Windows machines. 2013-12-05 19:18:33 +00:00
Samuel M Smith
58aca6e5ff Added fallback to manage.present to use lsof to get open connections for oses where /proc is not available 
This allows  manage.present to work on non linux but unix oses.
 2013-12-05 11:03:13 -07:00
Colton Myers
ffc85bcb4f Merge pull request #9050 from basepi/pillarincludedocs 
Fix pillar include example
 2013-12-05 08:35:41 -08:00
Colton Myers
5b90e371ce Fix pillar include example 
Fixes #9034
 2013-12-05 09:33:51 -07:00
Joseph Hall
17ca2aeac2 Merge pull request #9024 from cachedout/#8976 
Grains detection for LXC and fix error in disk.usage under Docker
 2013-12-05 04:34:15 -08:00
Joseph Hall
ee06057dc7 Merge pull request #9025 from terminalmage/issue8720 
Keep pid of salt CLI command from showing in status.pid output
 2013-12-05 04:32:09 -08:00
Joseph Hall
819a8918df Merge pull request #9044 from terminalmage/issue7952 
Fix py renderer example
 2013-12-05 04:16:45 -08:00
Erik Johnson
ac0e0cbbce Fix py renderer example 
The example had an incorrect data structure, this commit fixes that.
 2013-12-05 06:11:16 -06:00
Pedro Algarvio
a4ca5383ba Merge pull request #8995 from cvrebert/patch-1 
rm unused import from zcbuildout state
 2013-12-05 03:23:17 -08:00
Pedro Algarvio
6caa40bcbe Merge pull request #9039 from terminalmage/issue8585 
Fix argument parsing for arguments containing pound signs
 2013-12-05 03:21:18 -08:00
Pedro Algarvio
41798499d5 Merge pull request #9042 from mgwilliams/upstart 
upstart scripts: invoke via su so /etc/environment is read
 2013-12-05 03:20:24 -08:00
Matthew Williams
f89a3a466c syndic upstart: invoke via su so /etc/environment is read 2013-12-04 19:17:01 -08:00
Matthew Williams
2f1d42638f upstart scripts: invoke via su so /etc/environment is read 2013-12-04 19:09:59 -08:00
Erik Johnson
cadbcbd59d add test case for #8585 2013-12-04 17:29:48 -06:00
Erik Johnson
5ec7d9b113 Fix argument parsing for arguments containing pound signs 
Passing these through yaml.safe_load() will result in the pound sign and
everything after it being interpreted as a comment. This commit stops
the argument from being passed through yaml.safe_load if it is a string
and contains a pound sign.
 2013-12-04 17:18:46 -06:00
Pedro Algarvio
7442158364 Merge pull request #9027 from terminalmage/issue9002 
Pass through "env" in cmd.script
 2013-12-04 14:52:47 -08:00
Erik Johnson
acd3a8d8ee Pass through "env" in cmd.script 
Fixes #9002.
 2013-12-04 16:42:16 -06:00
C. R. Oldham
d6ea8a0c0d Merge pull request #9029 from erjohnso/develop 
Have to rely on source install of libcloud for now.
 2013-12-04 12:22:31 -08:00
C. R. Oldham
c14679ddae Merge pull request #9030 from cro/fix_8698 
Be more liberal about the format of the key we are looking for.
 2013-12-04 12:10:35 -08:00
C. R. Oldham
d188939b14 Be more liberal about the format of the key we are looking for. (e.g. accept 'ssh-rsa AAB3NzaC... comment' as well as just 'AAB3NzaC...') 2013-12-04 13:07:15 -07:00
Eric Johnson
9256e92e8e small issue in libcloud, need to install from source for now 2013-12-04 19:44:30 +00:00
Mike Place
398ebc1503 Don't run the #8976 tests on Windows. 2013-12-04 12:38:54 -07:00
Mike Place
8c31d96e17 Merge branch 'develop' into #8976 
* develop:
  Integration testing for #8976
 2013-12-04 12:34:47 -07:00
Mike Place
e6e0a7d919 Integration testing for #8976 2013-12-04 12:34:20 -07:00
C. R. Oldham
66d34c979c Merge pull request #9026 from cro/develop 
Return False if Postgres role create or role update fails.
 2013-12-04 11:18:46 -08:00
C. R. Oldham
ed5925c678 Return False if the role update fails (return value would be nonzero). 2013-12-04 12:16:22 -07:00
C. R. Oldham
5bf728343d Return False if the role creation fails (return value would be nonzero). Fixes #8778. 2013-12-04 12:13:36 -07:00
Erik Johnson
6a39fa4191 Keep pid of salt CLI command from showing in status.pid output 
When status.pid is executed by the salt-minion instance running on the
master, it also returns the pid of the salt CLI command, because the
search string matches. This commit adds another grep to the ps/grep/awk
one-liner, which filters out lines matching 'status.pid'.
 2013-12-04 12:39:59 -06:00
Mike Place
430df4c4e1 Grains detection for LXC and fix error in disk.usage under Docker 
I have modified the core grains detection routines where dragons often lay, so this should be reviewed carefully.

I have elected to set the LXC detection inside virtual_subtype for account for cases wherein a user might be running inside VirtualBox (as the tutorial for Docker leads one to do). Moreover, I also allow the virtualization detection to continue after LXC is detected, as I believe it may even be possibly for Xen and LXC to co-exist. (Though, let's be honest -- probably not recommended!)

Finally, disk.usage now correctly fails with a warning message and includes a work-around for gathering disk usage under Docker containers. This refs #8976.
 2013-12-04 11:18:15 -07:00
Samuel M Smith
cd1e587d65 Added debug 2013-12-04 10:42:44 -07:00
Samuel M Smith
e4693881ff Merge remote-tracking branch 'upstream/develop' into sam_20131202 2013-12-04 10:41:07 -07:00
ouiea
2ad4fd5107 Fixes issue #8951 - gem install fails when rvm is set up with another user 2013-12-04 12:11:08 -03:00
Frédéric Brin
b9ea313b91 Support Oracle Linux 5.x 
Oracle Linux 5, also known as Unbreakable Linux is currently
not supported by salt.

This one line fix solves this issue.

For reference, the os info extracted through platform.linux_distribution()
python call:
('Enterprise Linux Enterprise Linux Server', '5.1', 'Carthage')
 2013-12-04 15:50:49 +01:00
Pedro Algarvio
dc434ae1a5 Merge pull request #9017 from techhat/nodequery 
Allow single-provider node queries using -f
 2013-12-04 04:48:56 -08:00
Joseph Hall
f7785ad8f8 Remove code that was inadvertantly added too early 2013-12-04 05:46:49 -07:00
Joseph Hall
73ccda897e Disable pylint warnings about unused call variable 2013-12-04 05:44:50 -07:00