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,782 Commits 24 Branches 182 Tags 341 MiB
d52ad3a99a
Commit Graph

32782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
d52ad3a99a Lint 2014-06-19 22:21:16 -06:00
Thomas S Hatch
06981edade Merge pull request #13585 from cvrebert/patch-1 
states.dockerio.running: fix bad indentation
 2014-06-19 22:12:16 -06:00
Chris Rebert
ba2b7b1e14 states.dockerio.running: fix bad indentation 
************* Module salt.states.dockerio
salt/states/dockerio.py:632: [W0311(bad-indentation), ] Bad indentation. Found 7 spaces, expected 8
 2014-06-19 17:47:45 -07:00
Pedro Algarvio
d4c07d6776 Merge pull request #13574 from whiteinge/misc-salt-api-fixes 
Misc salt api fixes
 2014-06-20 01:28:41 +01:00
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
Seth House
66e2b54f36 Added encoding comment to empty init files 2014-06-19 17:37:44 -06:00
Seth House
d00cd104ac And yet more pylint fixes 2014-06-19 17:25:56 -06:00
rallytime
3a84dd4a3c Unit tests for cloud_config function in salt.config.py 2014-06-19 16:03:59 -06:00
Seth House
8eb5b29ee4 And more pylint fixes 2014-06-19 15:53:58 -06:00
Seth House
ccfc7de874 Even more pylint fixes (mostly pep8) 2014-06-19 15:51:26 -06:00
Denis Elistratov
89dba73833 Fix quoting problem in git.clone 2014-06-20 01:18:08 +04:00
Seth House
84ccaa49ec Fixed two pylint errors in the netapi cli client 2014-06-19 15:08:49 -06: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
Seth House
a8676b3043 grabbed two more pylint errors 2014-06-19 14:32:30 -06:00
Seth House
0df3f8150e pylint fixes for the rest_tornado netapi module 2014-06-19 14:25:30 -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
Seth House
d3f94a933e Added encoding comment to empty __init__.py file 2014-06-19 14:22:23 -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
Seth House
70901fa701 pylint fixes for the rest_wsgi netapi module 2014-06-19 14:11:16 -06:00
Seth House
6208f199ea pylint fixes for the rest_cherrypy module 2014-06-19 14:09:54 -06:00
Erik Johnson
54e47ca522 Use bash for build_shar.sh 
Bourne shell doesn't support arrays
 2014-06-19 15:04:10 -05:00
Seth House
7cf0a3f174 Switched to raw string for docstring to avoid pylint backslash complaints 2014-06-19 13:49:56 -06:00
Seth House
1f96c63963 Added encoding to netapi modules 2014-06-19 13:49:31 -06:00
Seth House
8f5e336a16 Added link to the writing netapi modules doc 2014-06-19 13:22:57 -06:00
Seth House
14f663f37e Added link to legacy salt-api release notes 2014-06-19 13:20:05 -06:00
Seth House
9f93aaf016 Renamed old autodoc-generated salt-api netapi module filenames 2014-06-19 13:19:24 -06: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
Seth House
d4f64e8d5d Disable the 'routing table' index from the httpdomain 
While very cool and quite handy, it doesn't make sense for how we use
netapi modules in Salt.
 2014-06-19 13:13:09 -06:00
Seth House
6d09e554e4 Fixed two straggling occurances of APIClient -> NetapiClient 2014-06-19 13:02:16 -06: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