valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,060 Commits 24 Branches 182 Tags 341 MiB
857208394f
Commit Graph

71060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aditya Kulkarni
857208394f Add support for more options to Cassandra CQL returner 2016-07-12 11:50:01 -04:00
Mike Place
81d5a7a8db Gate vbox reload (#34588) 
* Gate vbox reload

* Lower log level
 2016-07-11 15:47:04 -04:00
Mike Place
e94ab2034c Merge pull request #34589 from cachedout/unit_archive_fixup 
Fixup unit test for archive module
 2016-07-11 11:59:34 -06:00
Mike Place
a733b844be Fixup unit test for archive module 2016-07-11 11:59:00 -06:00
Mike Place
6cdaa0ea5f Merge pull request #34564 from techhat/azureip 
Improve public IP address resolution
 2016-07-11 08:21:06 -06:00
Mike Place
2f168a9e56 Merge pull request #34568 from sjorge/vmadm-runner 
introducing salt.runner.vmadm
 2016-07-11 08:03:29 -06:00
Mike Place
8a89d8dd3f Merge pull request #34570 from sjorge/apcups-module 
salt.module.apcups
 2016-07-11 08:00:47 -06:00
Mike Place
701f4d13ab Merge pull request #34572 from ajacoutot/openbsd-archive 
archive.extracted: unbreak on OpenBSD
 2016-07-11 07:58:31 -06:00
Mike Place
4a4149d72a Merge pull request #34573 from cedwards/patch-2 
Update freebsd.rst
 2016-07-11 07:57:46 -06:00
Christer Edwards
220a3ae53f Update freebsd.rst 
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
 2016-07-10 10:22:30 -06:00
Antoine Jacoutot
c43bd8fabe archive.extracted: unbreak on OpenBSD 
On OpenBSD, using tar in "legacy" mode, all option flags except for -C and -I
must be contained within the first argument to tar and must not be prefixed by a
hyphen. Since the state automatically adds '-f', we are not running in legacy
mode and as such, all options must be prefixed by a hyphen.

* before
[INFO    ] Executing command ['tar', 'xz', '-f', '/path/to/file.tgz'] in directory '/path/to/extractdir'
[ERROR   ] Command '['tar', 'xz', '-f', '/path/to/file.tgz']' failed with return code: 1
[ERROR   ] stderr: tar: Failed open to read on /dev/rst0: Device not configured
<snip>
Failed:    1

* after
[INFO    ] Executing command ['tar', '-xz', '-f', '/path/to/file.tgz'] in directory '/path/to/extractdir'
<snip>
Succeeded: 1 (changed=1)
 2016-07-10 10:43:08 +02:00
Jorge Schrauwen
b3e2f35465 salt.module.apcups - very simple wrapper for apcupsd\s apcstatus command 2016-07-09 16:52:53 +02:00
Jorge Schrauwen
5f7faa4098 salt.runner.vmadm 2016-07-09 10:56:51 +02:00
Joseph Hall
a3acc44ee9 Remove unnecessary pass 2016-07-08 20:41:50 -06:00
Joseph Hall
c5494b3cba Improve public IP address resolution 2016-07-08 16:02:08 -06:00
Mike Place
915652165f Merge pull request #34542 from rallytime/stringio-migrations 
Migrate StringIO imports to use the six library for Python2/3 compatibility
 2016-07-08 10:47:04 -06:00
Mike Place
393c26b675 Merge pull request #34535 from markuskramerIgitt/setup_py_should_not_print_each_file 
When building Windows installer, setup.py install will not print each file
 2016-07-08 10:42:46 -06:00
Mike Place
1748f5a522 Merge pull request #34543 from adelcast/dev/adelcast/process_beacons 
process_beacons: read beacon configuration from per minion opts
 2016-07-08 10:40:54 -06:00
Mike Place
8602c27d97 Merge pull request #34536 from rallytime/py3-core-grains-test 
Fix the unit.grains.core_test tests to run with Python3
 2016-07-08 10:20:35 -06:00
Mike Place
378ebf353c Merge pull request #34544 from adelcast/dev/adelcast/beacon_run_once 
beacons: add run_once config option
 2016-07-08 10:15:41 -06:00
rallytime
c539333924 Use six.moves.StringIO() 2016-07-08 09:30:58 -06:00
mrproper
294e76d671 Add apt key proxy support (#34541) 
* add missing proxy_ config options and defaults

* add support for http proxy for apt-key actions

* Fixes #34360.

* fix lint

* adjust defaults that are strings to empty strings

* change proxy_port to a default of 0 for config validator
 2016-07-08 11:01:39 -04:00
Alejandro del Castillo
3c974bbb72 beacons: add run_once config option 
Useful for code that needs to run once and stay in memory, but that
doesn't need polling.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2016-07-07 21:31:35 -05:00
Nicole Thomas
3e91f3299d Merge pull request #34539 from rallytime/pylint 
Pylint fix - import fnmatch
 2016-07-07 21:31:38 -04:00
rallytime
1f4a75f268 Move StringIO import to use six for tests.unit.modules.zypper_test.py 2016-07-07 19:27:30 -06:00
rallytime
163adfd2a1 Move StringIO import to use six for salt.states.jenkins.py 2016-07-07 19:19:55 -06:00
rallytime
2f058369ed Move StringIO import to use six for salt.serializers.configparser.py 2016-07-07 19:15:13 -06:00
rallytime
831d16ea5c Move StringIO import to use six for salt.renderers.smtp_return.py 2016-07-07 19:10:36 -06:00
rallytime
062ebba81c Move StringIO import to use six for salt.renderers.mako.py 2016-07-07 19:06:27 -06:00
rallytime
a5cb6d0dd5 Move StringIO import to use six for salt.netapi.rest_cherrypy.app.py 2016-07-07 19:00:47 -06:00
rallytime
807a445bfb Pylint fix - import fnmatch 2016-07-07 18:13:43 -06:00
Nicole Thomas
c6537a4ec6 Merge pull request #34538 from SaltyCharles/develop 
documentation typo
 2016-07-07 20:07:50 -04:00
SaltyCharles
7c939167e0 documentation typo 
fix typo in documentation
 2016-07-07 17:04:24 -07:00
SaltyCharles
cbcb854f7e Merge remote-tracking branch 'saltstack/develop' into develop 2016-07-07 17:01:48 -07:00
rallytime
7c216c3a1d Fix the unit.grains.core_test tests to run with Python3 2016-07-07 16:41:21 -06:00
Mike Place
e550937e57 Merge pull request #34528 from kraney/boto_apigateway 
for options method, authorization_type should always be NONE, otherwi…
 2016-07-07 16:06:27 -06:00
Mike Place
bb0c7118ba Merge pull request #34502 from markuskramerIgitt/develop 
Windows installer build scripts will exit on error
 2016-07-07 16:05:31 -06:00
markuskramerIgitt
d87277ef89 setup.py will not print each individual file 2016-07-07 23:57:28 +02:00
Alejandro del Castillo
fce64d8ccf process_beacons: read beacon configuration from per minion opts 
The beacon manipulation functions, such as enable_beacons and
disable_beacons, use self.opts to enable/disable beacons. However,
process_beacons use __opts__ to retrieve the becon's configuration,
which is no longer the same, due to comit 5821b39. Make process_beacon
read beacon configuration from self.opts instead.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2016-07-07 21:56:36 +00:00
Nicole Thomas
907f356770 Merge pull request #34525 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-07 17:53:24 -04:00
mrproper
752c83d248 Add apt key proxy support (#34407) 
* add missing proxy_ config options and defaults

* add support for http proxy for apt-key actions

* Fixes #34360.

* fix lint

* adjust defaults that are strings to empty strings
 2016-07-07 17:21:34 -04:00
markuskramerIgitt
9a2ef46d36 setup.py will not print each individual file 2016-07-07 23:20:09 +02:00
Mike Place
ede3eaaca0 Merge pull request #34512 from techhat/azurenetrg 
Use correct resourcegroup for network interfaces
 2016-07-07 15:06:20 -06:00
Mike Place
2e53d038ce Merge pull request #34519 from SaltyCharles/develop 
update docker_events dependency reference
 2016-07-07 15:04:33 -06:00
Mike Place
d7acb758d9 Merge pull request #34483 from msciciel/systemd-xenserver-7 
Add support for systemd in latest XenServer 7.0 release which is now …
 2016-07-07 15:03:27 -06:00
Mike Place
c35b16a355 Merge pull request #34522 from thatch45/checkev 
Add check.event to thorium
 2016-07-07 15:02:02 -06:00
Mike Place
fedb4e0626 Merge pull request #34523 from thatch45/reject_keys 
Add support to reject keys
 2016-07-07 15:01:49 -06:00
rallytime
b4fc949b1a Pylint fix 2016-07-07 14:44:48 -06:00
Winston Liu
1f1e446309 for options method, authorization_type should always be NONE, otherwise CORS support will not work properly when other methods are using authorization_type AWS_IAM. 2016-07-07 13:34:07 -07:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00