valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,693 Commits 24 Branches 182 Tags 341 MiB
0c9da726f5
Commit Graph

42693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
ce5d49b374 Merge pull request #18388 from hulu/returner-shadowing 
avoid shadowing in returners.multi_returner
 2014-11-21 19:40:06 -07:00
Joseph Hall
9e94072d25 Merge pull request #18399 from hulu/routes-shadowing 
avoid shadowing in salt.modules.network
 2014-11-21 19:39:28 -07:00
Pedro Algarvio
0b946ba32b Merge branch '2014.7' into hotfix/merge-forward 2014-11-22 02:17:10 +00:00
Pedro Algarvio
6e0f4da593 Fix syntax errors 2014-11-22 02:16:26 +00:00
Pedro Algarvio
360949c0e0 Merge pull request #18392 from thatch45/listen_fix 
Check for listen data struct validity
 2014-11-22 02:01:13 +00:00
Ben Miller
407fe00871 add runit service module 2014-11-21 20:26:18 -05:00
Chris Rebert
98a02b032d avoid shadowing in salt.modules.network 2014-11-21 16:57:43 -08:00
Joseph Hall
fe407e9167 Linting 2014-11-21 17:21:28 -07:00
Joseph Hall
240c8f2eac Merge pull request #18389 from rallytime/fix_unused_arg 
Fix unused args in modules/cloud.py
 2014-11-21 17:16:46 -07:00
Thomas S Hatch
60a1483bfd Merge pull request #18377 from thatch45/usr_fix 
Use the sdecode routine
 2014-11-21 17:16:34 -07:00
Joseph Hall
9a38c515cd Merge pull request #18385 from rallytime/cloud_events_doc 
Add information about salt-cloud events to master events doc
 2014-11-21 17:11:57 -07:00
rallytime
d6450f46cb Add warning about using --out in runners/mine.py 
Fixes #18390
 2014-11-21 17:01:03 -07:00
Mike Place
6ba28b4df2 Initial sketch of CLI progress 2014-11-21 16:55:43 -07:00
Pedro Algarvio
50bb9c3867 Merge branch '2014.7' into hotfix/merge-forward 
Conflicts:
	salt/fileclient.py
 2014-11-21 23:39:28 +00:00
Pedro Algarvio
49e38788cd Merge pull request #18393 from s0undt3ch/2014.7 
Use requests instead of github package. Also output the PR incoming branch
 2014-11-21 23:37:13 +00:00
Pedro Algarvio
74e23b9e26 And also the base branch of the incoming PR's branch 2014-11-21 23:35:37 +00:00
Pedro Algarvio
672e98cf0f Use requests instead of github package. Also output the PR incoming branch. 2014-11-21 23:33:29 +00:00
Thomas S Hatch
00b2848b0f Add data structure check to listen flag 2014-11-21 16:27:34 -07:00
Thomas S Hatch
648cf261c1 Merge pull request #18381 from cvrebert/patch-1 
fix typo in utils.parsers.OptionParser.parse_args
 2014-11-21 16:16:28 -07:00
Thomas S Hatch
7d20891c16 try with string cast 2014-11-21 16:15:31 -07:00
Thomas S Hatch
864ad4b3a2 Merge pull request #18378 from rallytime/bp-18079 
Backport #18105 to 2014.7
 2014-11-21 16:13:57 -07:00
Thomas S Hatch
681fe94b65 Merge pull request #18375 from rallytime/remove_unused_arg 
Remove 'repo' argument as it isn't used by function
 2014-11-21 16:13:07 -07:00
Thomas S Hatch
0b4c8b9ab2 Merge pull request #18363 from jacksontj/2014.7 
Fix for #8670
 2014-11-21 16:12:52 -07:00
T.J. Yang
5f3cf20ffc makefile update at Fri Nov 21 17:12:48 CST 2014 2014-11-21 17:12:48 -06:00
rallytime
dd47871f0a Fix unused args in modules/cloud.py 
Fixes #18387
 2014-11-21 16:12:43 -07:00
Thomas S Hatch
f7b9ad4533 Merge pull request #18351 from lyft/grains-and-pillar-reloads 
Add reload_grains and reload_pillar global state arguments
 2014-11-21 16:11:54 -07:00
Chris Rebert
7e696a7885 avoid shadowing in returners.multi_returner 2014-11-21 15:11:09 -08:00
Thomas S Hatch
a679d71128 Only run if it is a string, change in develop for six compat 2014-11-21 16:08:43 -07:00
Thomas S Hatch
644f69eb75 Merge pull request #18343 from thatch45/requests_crazy 
Fix #18131
 2014-11-21 16:04:00 -07:00
Thomas S Hatch
1b68371494 Merge pull request #18376 from thatch45/18361 
Add sdecode for highstate
 2014-11-21 16:03:35 -07:00
Thomas S Hatch
27b4d83892 Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/__init__.py
 2014-11-21 16:02:05 -07:00
Thomas S Hatch
c858e4391f Merge pull request #18365 from jacksontj/2014.7-config 
Better output on requisite failure
 2014-11-21 16:00:53 -07:00
Thomas S Hatch
b74b140d99 Merge pull request #18386 from thatch45/lint865 
lint fix
 2014-11-21 15:59:55 -07:00
Thomas S Hatch
c54f9444fe lint fix 2014-11-21 15:59:16 -07:00
rallytime
91538d7ec1 Add information about salt-cloud events to master events doc 2014-11-21 15:57:59 -07:00
Thomas S Hatch
27ebc19c93 Merge pull request #18368 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-11-21 15:57:04 -07:00
Thomas S Hatch
be494c9c4a Merge pull request #18374 from thatch45/18053 
Add new sdecode to nested outputter
 2014-11-21 15:54:33 -07:00
Joseph Hall
32ec7be6f9 Switch ec2 driver to signature version 4 2014-11-21 15:49:15 -07:00
Thomas S Hatch
e3716ab322 Merge pull request #18383 from thatch45/stray_print 
remove stray print
 2014-11-21 15:48:46 -07:00
Thomas S Hatch
590b5a3a56 iremove stray print 2014-11-21 15:44:28 -07:00
Thomas S Hatch
89f9bca761 Add verification of unicode data in windows data sets 2014-11-21 15:34:41 -07:00
Chris Rebert
8f6af9625c fix typo in utils.parsers.OptionParser.parse_args 
************* Module salt.utils.parsers
salt/utils/parsers.py:157: [E1101(no-member), OptionParser.parse_args] Module 'logging' has no 'getlogger' member
 2014-11-21 14:27:16 -08:00
Thomas S Hatch
a1f060c0bb Fixes #15690 2014-11-21 14:28:12 -07:00
Thomas S Hatch
ec94a468ee more lint 2014-11-21 14:27:52 -07:00
Tait Clarridge
c4a07faf09 Fix for cross-platform sysctl with test and custom config location when using systemd >= 207 
When using a custom config path for sysctl states, it would fail with an IOError
as it was looking for the defaults which also may not exist as shown below:

----------
          ID: net.ipv4.tcp_keepalive_intvl
    Function: sysctl.present
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib/python2.7/site-packages/salt/state.py", line 1533, in call
                  **cdata['kwargs'])
                File "/usr/lib/python2.7/site-packages/salt/states/sysctl.py", line 56, in present
                  configured = __salt__['sysctl.show'](config_file=True)
                File "/usr/lib/python2.7/site-packages/salt/modules/linux_sysctl.py", line 86, in show
                  for line in salt.utils.fopen(config_file_path):
                File "/usr/lib/python2.7/site-packages/salt/utils/__init__.py", line 1065, in fopen
                  fhandle = open(*args, **kwargs)
              IOError: [Errno 2] No such file or directory: '/etc/sysctl.d/99-salt.conf'

The corresponding state had a config file specified that was ignored. But this would hold true for any
minion meeting the systemd conditions and not having 99-salt.conf. Now, for normal highstate runs, the current
and configured options are not run unless test is specified and if the configured check returns none, the
user will be notified that there was an issue reading the default/specified file.

Platforms other than linux also appeared to not have the config_file argument for show() that would have probably (I did not verify) bail out with argument number errors during normal runs.

Conflicts:
	salt/modules/netbsd_sysctl.py
	salt/modules/openbsd_sysctl.py
 2014-11-21 14:26:46 -07:00
Thomas S Hatch
a7892ccf8d Use the sdecode routine 2014-11-21 14:06:12 -07:00
Thomas S Hatch
69e2a2d9fe remove unused imports 2014-11-21 14:01:00 -07:00
Thomas S Hatch
f4ddb529e1 Use sdecode in highstate 2014-11-21 13:59:58 -07:00
Thomas S Hatch
b1e2d289fe Merge pull request #18366 from thatch45/saltfile_parser 
Get non standard saltfile opts into opts
 2014-11-21 13:58:55 -07:00
rallytime
0d2e6a0456 Remove 'repo' argument as it isn't used by function 2014-11-21 13:57:15 -07:00