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
68,479 Commits 24 Branches 182 Tags 341 MiB
0c566dce89
Commit Graph

68479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
a9ea3444ad Back-port #34256 to 2016.3 (#34343) 
* detect running from master in State.event method

This changes `State.event` to detect whether the state that invoked `fire_event` is running on the master. This fixes an issue where the `fire_event` requisite doesn't work when being used in orchestration states.

* fix linting issues
 2016-06-28 18:08:48 -04:00
rallytime
359e8ca2ce Pylint fixes 2016-06-28 16:04:47 -06:00
Thomas S Hatch
0b9cb602fe Merge pull request #34338 from themalkolm/patch-2 
Add listen/listen_in support to stateconf.py
 2016-06-28 15:50:14 -06:00
C. R. Oldham
14ea29f446 Remove proxy check and additional GetConnection--this makes the proxy fail to start. Need to check to see if proxy memory leak is back. 2016-06-28 15:25:48 -06:00
Nicole Thomas
94e094652c Back-port #34324 to 2015.8 (#34344) 
* Add test to match against custom grains

* Lint

* Forgot to add custom grain
 2016-06-28 16:35:32 -04:00
Nicole Thomas
11dc0203b0 Making salt-ssh pass proper return codes for jinja rendering errors (#34342) 2016-06-28 16:34:56 -04:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
Erik Johnson
f6bd1ad47e Revert py3modernize lint changes (#34339) 
* salt/__init__.py: revert py3modernize lint changes

* salt/cloud/clouds/vmware.py: revert py3modernize lint changes

* salt/modules/jboss7_cli.py: revert py3modernize lint changes

* salt/payload.py: revert py3modernize lint changes

* salt/serializers/yamlex.py: revert py3modernize lint changes

* salt/states/win_servermanager.py: use absolute imports

* salt/utils/args.py: revert py3modernize lint changes

* salt/utils/decorators/__init__.py: use __name__ instead of func_name

__name__ is py3-compatible and also works on builtins in py2, which
func_name does not.

* salt/utils/compat.py: revert py3modernize lint changes

* salt/utils/__init__.py: revert py3modernize lint changes

* salt/version.py: revert py3modernize lint changes

* tests/salt-tcpdump.py: revert py3modernize lint changes
 2016-06-28 16:04:02 -04:00
Mike Place
80a659bb51 Merge pull request #34283 from sjorge/2016.3-mount-fstab 
2016.3 mount vfstab support
 2016-06-28 12:23:39 -07:00
Mike Place
75aad073a9 Merge pull request #34322 from Ch3LL/add_grains_majorrelease_test 
add osmajorrelease grain for raspbian
 2016-06-28 12:08:39 -07:00
Mike Place
046bdaa9f2 Merge pull request #34306 from ghedo/iptables_flush_table 
Fix iptables.flush state: Do not force 'filter' table when flushing
 2016-06-28 12:03:14 -07:00
Mike Place
81547f413d Merge pull request #34337 from clinta/serialize-merge 
Change merge-if-exists logic to properly report changes
 2016-06-28 11:41:56 -07:00
Mike Place
affc65dc79 Merge pull request #34300 from vutny/fix-apache-vhost-options 
Make apache.configfile state handle the Options list correctly
 2016-06-28 11:34:45 -07:00
Alexander Krasnukhin
cd63541325 Add listen/listen_in support to stateconf.py 
Add `listen/listen_in` everywhere where `watch/watch_in` is used.
 2016-06-28 19:11:54 +02:00
Clint Armstrong
ebe7def2fb Change merge-if-exists logic to properly report changes 2016-06-28 12:55:27 -04:00
Mike Place
970aaa46d4 Merge pull request #34252 from gtmanfred/2015.5 
return list of nodes for lxc driver when called directly
 2016-06-28 09:50:47 -07:00
jacobhammons
0c60feac02 Doc clarifications to file modules, addition of new profile log level to docs, fixed example in dnsmasq (#34323) 
Refs #34249
Refs #34261
Refs #33694
Refs #34247
 2016-06-28 12:03:59 -04:00
Nicole Thomas
af83f59313 version checking had a logical error (#34333) 
The current version of rabbitmq, 3.6.2 was not matched
 2016-06-28 11:51:36 -04:00
Clint Armstrong
53de70f658 fix #34329 (#34330) 2016-06-28 11:40:40 -04:00
Erik Johnson
b793426c23 Remove unnecessarily-disabled sanity check (#34325) 
This was commented out for reasons having nothing to do with anything
else going on in 0c069dd. Uncommenting this sanity check so that we are
notified if we need to update our targets in the future.
 2016-06-28 11:12:55 -04:00
Nicole Thomas
c5890a0eca Merge pull request #34335 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-28 11:07:15 -04:00
rallytime
2296587536 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-06-28 09:04:56 -06:00
Alessandro Ghedini
882c6c9c86 Do not force 'filter' table when flushing 
The "table" argument is already part of the function signature, this means
that flush() will always force the "filter" table even when the user sets
a different one.
 2016-06-28 15:40:50 +01:00
Ch3LL
693cc61aa4 add osmajorrelease to ubuntu and fix pylint 2016-06-27 16:32:21 -06:00
Nicole Thomas
e168b05a87 Fix psutil.cpu_times unpack error (#34318) 2016-06-27 18:25:58 -04:00
Nicole Thomas
a6d3cc637b Typo in dockerio doc (#34319) 2016-06-27 18:25:19 -04:00
Ch3LL
2fc3e8a54b add osmajorrelease grain for raspbian 2016-06-27 14:45:09 -06:00
Nicole Thomas
6cce545d92 Merge pull request #34313 from rallytime/bootstrap-2015.5 
[2015.5] Update to latest bootstrap script v2016.06.27
 2016-06-27 15:00:08 -04:00
Nicole Thomas
dd4c937009 Merge pull request #34312 from rallytime/bootstrap-2015.8 
[2015.8] Update to latest bootstrap script v2016.06.27
 2016-06-27 14:59:59 -04:00
Nicole Thomas
1398b1c51e Merge pull request #34311 from rallytime/bootstrap-2016.3 
[2016.3] Update to latest bootstrap script v2016.06.27
 2016-06-27 14:59:27 -04:00
rallytime
75aa7047bc [2016.3] Update to latest bootstrap script v2016.06.27 2016-06-27 12:17:53 -06:00
rallytime
944a393f89 [2015.8] Update to latest bootstrap script v2016.06.27 2016-06-27 12:16:55 -06:00
rallytime
c7db73be92 [2015.5] Update to latest bootstrap script v2016.06.27 2016-06-27 12:15:26 -06:00
Mike Place
91703d2dc4 Merge pull request #34307 from rallytime/fix-test-example 
Fix test example in integration testing docs
 2016-06-27 10:41:24 -07:00
Mike Place
dc8462451d Merge pull request #34284 from rallytime/fix-34129 
Don't require 'domain' to be present before checking fqdn_ip* grains
 2016-06-27 10:06:17 -07:00
Mike Place
259935d6d2 Merge pull request #34296 from sjorge/2016.3-module.status 
2016.3 status module now works on Solaris like platforms
 2016-06-27 09:49:41 -07:00
rallytime
f44a0543fe Fix test example in integration testing docs 
The example is out of date compared to the actual test it's modeling.

Notably, the self.state_result() function doesn't exist.
 2016-06-27 10:22:15 -06:00
Denys Havrysh
52001afdde Fix apache.configfile state example 2016-06-27 13:02:10 +03:00
Denys Havrysh
64a9442e38 apache.config: correctly output a list of the Options 2016-06-27 12:05:03 +03:00
Jorge Schrauwen
b8c6948cd5 fixes broken rm_fstab test due to missing __grain__.kernel 2016-06-25 15:42:15 +02:00
Jorge Schrauwen
a26340c555 make status.all_status work on Solaris like platforms 2016-06-25 15:28:01 +02:00
Jorge Schrauwen
33e24fa697 make status.cpustats work on Solaris like platforms 2016-06-25 15:21:28 +02:00
Jorge Schrauwen
d214e9c776 correctly cast to int for status.netdevs on Solaris like platforms 2016-06-25 14:57:37 +02:00
Jorge Schrauwen
b74761b52d make status.cpuinfo support Solaris like platforms and OpenBSD 2016-06-25 14:55:10 +02:00
Jorge Schrauwen
2cd76d5ab5 make status.diskstats work on Solaris like platforms 2016-06-25 14:08:16 +02:00
Jorge Schrauwen
3211538830 make status.diskusage work on Solaris like platforms 2016-06-25 14:01:22 +02:00
Jorge Schrauwen
a12b311a62 make status.netdev compatible with Solaris like platforms 2016-06-25 13:27:16 +02:00
Jorge Schrauwen
3bc01458aa make status.netstats compatible with Solaris like platforms 2016-06-25 12:55:41 +02:00
Jorge Schrauwen
25678901fa avoid KeyError in ping_master 2016-06-25 12:17:28 +02:00
Jorge Schrauwen
81d7fc98d8 make status.vmstats work on Solaris like platforms and OpenBSD 2016-06-25 12:04:34 +02:00