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,355 Commits 24 Branches 182 Tags 341 MiB
8398de0baf
Commit Graph

68355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -06:00
Mike Place
ad63b1d3d3 Merge pull request #34292 from twangboy/fix_runas 
Fix runas function for System Account
 2016-06-30 11:25:09 -07:00
Mike Place
fe18bbb527 Merge pull request #34392 from cro/salt-cloud-doc-clarify 
Clarify that salt-cloud doesn't get installed by bootstrap
 2016-06-30 11:16:23 -07:00
Mike Place
be9a831ef6 Merge pull request #34388 from rallytime/bp-34378 
Back-port #34378 to 2016.3
 2016-06-30 10:50:48 -07:00
C. R. Oldham
a8cc8872e1 Esxi dvs (#34352) 
* Better error messages when proxy fails to start

* Complete module to add host & migrate adapters to DVS

* Lint, and add documentation for function parameters.

* Lint, rebase.
 2016-06-30 12:43:59 -04:00
C. R. Oldham
6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap 2016-06-30 10:27:52 -06:00
Alejandro del Castillo
2040dbeca5 network_settings.py: fix documentation 
Module documentation is showing an incorrect config example since it's
omitting the network_settings identifier.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2016-06-30 09:15:02 -06:00
Nicole Thomas
70e1f18b89 Beacon network docs (#34386) 
* Add beacons/network_settings to doc build

* Add a versionadded tag for the beacons.network_settings module
 2016-06-30 11:12:55 -04:00
Mike Place
45b8fb10d7 Merge pull request #34373 from jtand/network_state_integration_test 
Network state integration test
 2016-06-30 08:05:44 -07:00
Erik Johnson
d6af1de0b7 Optimize pkg integration tests and add a couple new tests (#34377) 
* Remove redundant usage of destructiveTest decorator

* Remove unnecessary SLS file

This simple state can be run using run_state

* Explicitly order tests

* Use run_state instead of invoking state.sls

* Ensure only one refresh_db done during pkg integration tests

* Add pkg.latest test for package without an epoch

* Optimize pkg.latest_version usage in pkg integration tests

* Clarify outcome when only_upgrade is used

* Add pkg.latest test with only_upgrade=True
 2016-06-30 10:48:22 -04:00
Nicole Thomas
5a44b077a0 Merge pull request #34376 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-30 10:31:28 -04:00
twangboy
433f300eba Enable all privileges 2016-06-29 17:49:44 -06:00
twangboy
5584cc2c6f Handle users that aren't admin 2016-06-29 17:49:44 -06:00
twangboy
e9d2402c0b Fix runas function for System Account 2016-06-29 17:49:44 -06:00
rallytime
3149da1bcc Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-29 16:16:46 -06:00
Justin Anderson
1d24053e36 network.system sls file 2016-06-29 14:31:46 -06:00
Justin Anderson
4a9e6af542 network.routes sls file 2016-06-29 14:31:07 -06:00
Justin Anderson
76c90b2ef6 network.managed sls file 2016-06-29 14:30:23 -06:00
Justin Anderson
84a36369fa Added network state integration test 2016-06-29 14:28:36 -06:00
Mike Place
3808d849fe Merge pull request #34365 from sjorge/2016.3-fix-broken-smartos-grains 
fixes computenode_* grains on SmartOS compute nodes
 2016-06-29 10:55:24 -07:00
Mike Place
af8ef1e461 Merge pull request #34368 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-29 10:54:49 -07:00
rallytime
3bce0cb510 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/cloud/clouds/lxc.py
 2016-06-29 11:01:51 -06:00
Jorge Schrauwen
3ff895cacf fixes computenode_* grains on SmartOS compute nodes 2016-06-29 18:12:37 +02:00
Mike Place
65efb55917 Merge pull request #34353 from cro/pyvmomi-ssl-fail 
Remove proxy check and additional GetConnection--this makes the proxy…
 2016-06-29 07:54:47 -07:00
Nicole Thomas
c89d1ad27f Merge pull request #34348 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-28 19:28:45 -04:00
rallytime
c87a108a12 Don't forget the pylint disables for range 2016-06-28 16:52:37 -06:00
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