valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
32,761 Commits 24 Branches 182 Tags 341 MiB
99febb1119
Commit Graph

32761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
99febb1119 Merge pull request #13577 from Lendar/fix-git-clone-quotes 
Fix quoting problem in git.clone
 2014-06-20 00:51:51 +01:00
Pedro Algarvio
15071b460a Merge pull request #13579 from rallytime/cloud_config_unittests 
Unit tests for cloud_config function in salt.config.py
 2014-06-20 00:50:08 +01:00
rallytime
3a84dd4a3c Unit tests for cloud_config function in salt.config.py 2014-06-19 16:03:59 -06:00
Denis Elistratov
89dba73833 Fix quoting problem in git.clone 2014-06-20 01:18:08 +04:00
Thomas S Hatch
a65bdce734 Merge pull request #13573 from nshalman/smartos-audit-context 
SmartOS: run salt minion in an audit context
 2014-06-19 14:48:38 -06:00
Thomas S Hatch
c1120d912c Merge pull request #13572 from terminalmage/update-shar-script 
Use bash for build_shar.sh
 2014-06-19 14:25:07 -06:00
Thomas S Hatch
76b285aa58 Merge pull request #13571 from panoptix-za/fix-dockerio-logging-running 
Improve the 'running' state
 2014-06-19 14:24:44 -06:00
Thomas S Hatch
daba2db258 Merge pull request #13563 from garethgreenaway/debian_ip_fixes 
Fixes to debian_ip.py and friends.
 2014-06-19 14:23:14 -06:00
Thomas S Hatch
fd56c9f17e Merge pull request #13557 from panoptix-za/salt-ssh-errorhandling 
Improve the salt-ssh error handling
 2014-06-19 14:22:21 -06:00
Thomas S Hatch
a46e6f4875 Merge pull request #13383 from s0undt3ch/issues/10404-vt-ptys-not-released 
[DO NOT MERGE] Fix #10404 vt ptys not released
 2014-06-19 14:16:52 -06:00
Nahum Shalman
3e5742bb73 SmartOS: run salt minion in an audit context 
This fixes an issue @njones11 was having with
multiple cron.present states.

"crontab -l <username>" would fail, so the temp file
would be empty, a given cronjob would go in
and then the "su - <username> crontab <temp file>" would
succeed.

This evaded debugging attempts because if you invoked the salt
minion manually from a login shell, an audit context would
already exist and the "crontab -l <username>" would succeed.

The hint was a message in the debug log of:
[ERROR   ] Command 'crontab -l legion' failed with return code: 1
[ERROR   ] stderr: crontab: The audit context for your shell has not
been set.

We explicitly set up an audit context when launching the salt minion
which allows "crontab -l <username>" to succeed.

This may fix other issues and something similar
should perhaps be applied to pkg/smartos/salt-minion.xml

"5417" was chosen arbitrarily
 2014-06-19 16:11:49 -04:00
Erik Johnson
54e47ca522 Use bash for build_shar.sh 
Bourne shell doesn't support arrays
 2014-06-19 15:04:10 -05:00
Stephan Buys
499645628d Improve the 'running' state's handling of param 0 as well as 'name' kwarg. Enable logging for state. 2014-06-19 21:15:29 +02:00
Joseph Hall
cfe1349783 Merge pull request #13569 from rallytime/cloud_error_msg 
Clarified salt-cloud user error reporting
 2014-06-19 12:54:20 -06:00
rallytime
a43e4de7db Clarified salt-cloud error reporting 2014-06-19 12:52:19 -06:00
Seth House
ad66f9c2cf Merge pull request #13567 from s0undt3ch/hotfix/bootstrap-script 
Update bootstrap script to latest stable
 2014-06-19 12:48:32 -06:00
Pedro Algarvio
c1096cf760 Update bootstrap script stable version 2014-06-19 19:36:51 +01:00
Pedro Algarvio
8e36395384 Update bootstrap script to latest stable 2014-06-19 19:35:48 +01:00
Seth House
cbc3775fbc Remove the sphinxcontrib from the import path 
I swear I fixed this during the merge. Must have undone the change
somehow.
 2014-06-19 12:27:31 -06:00
Pedro Algarvio
f518e1f186 Merge pull request #13564 from rallytime/migrate_cloud_config_tests 
Migrate cloud config tests
 2014-06-19 19:10:17 +01:00
Thomas S Hatch
b6cc31e8af Merge pull request #13554 from whiteinge/saltapi-merge 
salt-api merge!
 2014-06-19 11:44:52 -06:00
Colton Myers
209c96c87a Merge pull request #13566 from basepi/cherrypick13536 
Ensure evaluation of the virtual grain for Xen
 2014-06-19 11:33:12 -06:00
Wolodja Wentland
ade6b936f1 Ensure evaluation of the virtual grain for Xen 
The fix for #11877 broke the grains for Xen hosts as reported in #13534

Conflicts:
	salt/grains/core.py
 2014-06-19 11:32:31 -06:00
Seth House
9821edcd04 Merge pull request #3 from s0undt3ch/hotfix/saltapi-merge-tests 
saltapi merge tests fixes
 2014-06-19 10:19:38 -06:00
Colton Myers
11224456eb Merge pull request #13565 from cachedout/13533 
Fix reversed params.
 2014-06-19 09:58:40 -06:00
Mike Place
ed523cd44d Fix reversed params. 
Closes #13533
 2014-06-19 09:36:29 -06:00
rallytime
8f74282a34 Removed cloud_config_test.py file 2014-06-19 09:24:47 -06:00
Gareth J. Greenaway
c70c2057b8 fixing an issue in the debian networking template related to DNS servers. Since Ubuntu has moved away from /etc/default/networking since the 12.04 release, the build_network_settings doesn't create this file on Ubuntu systems higher than 12.04, the get_network_settings shouldn't return anything including defaults. 2014-06-19 08:23:25 -07:00
rallytime
e53ec01cd4 Transfer cloud_config_test.py tests to config_test.py 2014-06-19 09:20:38 -06:00
Joseph Hall
6986efe738 Merge pull request #13559 from ronnix/patch-1 
Docs: fix list formatting on the Installation page
 2014-06-19 07:56:31 -06:00
Joseph Hall
e1fc930d49 Merge pull request #13560 from s0undt3ch/develop 
Lint fixes
 2014-06-19 07:55:36 -06:00
Pedro Algarvio
34fcf1da45 Test if we're closing open PTY's 2014-06-19 13:08:50 +01:00
Pedro Algarvio
1900409658 Only close FD's if open. Only wait if alive. 2014-06-19 13:08:50 +01:00
Pedro Algarvio
9e9e258cce Close VT PTY's. Fixes #10404. 2014-06-19 13:08:49 +01:00
Pedro Algarvio
7590586d05 Don't fail on missing CherryPy 2014-06-19 13:00:38 +01:00
Pedro Algarvio
c0ffb0814a Make the NetAPI tests skip if CherryPy is not installed 2014-06-19 12:59:23 +01:00
Pedro Algarvio
3c73c9c4c6 Provide a switch to run the NetAPI tests. 2014-06-19 12:58:52 +01:00
Pedro Algarvio
1a9a7fb87e Merge branch 'develop' of github.com:saltstack/salt into hotfix/saltapi-merge-tests 2014-06-19 12:01:33 +01:00
Pedro Algarvio
c883935db8 Switch to string formatting 2014-06-19 11:54:14 +01:00
Pedro Algarvio
ac8bec8c01 Double to single quotes 2014-06-19 11:51:22 +01:00
Ronan Amicel
77dfa9eff4 Docs: fix list formatting on the Installation page 2014-06-19 11:56:28 +02:00
Stephan Buys
81f8898f92 Improve the salt-ssh error handling to try and stop JSON rendering errors from halting the salt-ssh run entirely. 2014-06-19 09:25:55 +02:00
Seth House
6178a9adec Misc lint fixes 2014-06-19 00:04:20 -06:00
Thomas S Hatch
060f34f746 Merge pull request #13526 from s0undt3ch/hotfix/setup-raet 
simpler requirements setup
 2014-06-18 23:55:01 -06:00
Thomas S Hatch
9dfbf5aced Merge pull request #13556 from nmadhok/fix-doc-typo 
Fixed typo
 2014-06-18 23:50:20 -06:00
Nitin Madhok
2e27b9d1df Fixed typo 2014-06-19 01:40:39 -04:00
Seth House
3ce2c66cc4 Lint errors; removed imports; removed signal_handler function 
CherryPy's quickstart does signal handling. We don't need this here.
 2014-06-18 23:37:12 -06:00
Seth House
295e0b9060 Temporarily commented out docs Mock decorator conditional 
This worked in the smaller salt-api project but is choking somewhere in
the larger Salt project. We do need this but we need the salt-api merge
sooner. Commented out for now.
 2014-06-18 23:20:27 -06:00
Seth House
1d676fe051 Removed extra d in versionadded 2014-06-18 23:19:58 -06:00
Seth House
061a43b6f3 Added netapi docs to TOC 2014-06-18 23:19:45 -06:00