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,103 Commits 24 Branches 182 Tags 341 MiB
49f40e9d99
Commit Graph

71103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
 2016-07-12 16:13:56 -06:00
Nicole Thomas
61f5045a0d Merge pull request #34619 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-12 17:52:00 -04:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Joseph Hall
f83e81371a Properly gate makostack (#34614) 2016-07-12 16:12:22 -04:00
Nicole Thomas
9f123543e5 Merge pull request #34617 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-07-12 16:11:40 -04:00
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -06:00
Nicole Thomas
b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (#34593) 2016-07-12 15:18:53 -04:00
Justin Anderson
57df38e685 Update github IP for ssh state integration tests (#34592) 2016-07-12 15:17:41 -04:00
Ken Crowell
12b579c4e3 When sorting list actual_data, make it a list (#34590) 
This at least impacts the `running` state when updating container
with no `volumes_from` to some.
 2016-07-12 15:16:11 -04:00
Nicole Thomas
357649313a Avoid circular imports when calling salt.utils functions (#34586) 
Also remove unused imports:
  - platform
  - hashlib.md5
  - salt.utils.process.MultiprocessingProcess
  - tornado.concurrent
 2016-07-12 15:13:57 -04:00
Nicole Thomas
efc2ab9d68 [2016.3] Avoid salt.utils circular imports when using "from" (#34585) 
Also removes an unused import
 2016-07-12 15:13:26 -04:00
jacobhammons
c8bdfb272d Merge pull request #34616 from jacobhammons/network-settings-mock 
Adds a mock required for the network settings beacon
 2016-07-12 13:09:30 -06:00
Jacob Hammons
5e2ddb5eb0 Adds a mock required for the network settings beacon 2016-07-12 13:08:46 -06:00
Nicole Thomas
2e1007254b Avoid circular imports when calling salt.utils functions (#34584) 2016-07-12 13:41:30 -04:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591) 
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
 2016-07-12 13:33:31 -04:00
Mike Place
81d5a7a8db Gate vbox reload (#34588) 
* Gate vbox reload

* Lower log level
 2016-07-11 15:47:04 -04:00
Nicole Thomas
d8c8b4ac6f Merge pull request #34553 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-11 15:36:26 -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
5b002e11b4 Merge pull request #34569 from eliasp/2016.3-postgres-doc 
Minor doc fixes for PostgreSQL states
 2016-07-11 08:02:12 -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
Elias Probst
221da29ef5
Typo (defaul → default) 2016-07-09 16:02:38 +02:00
Elias Probst
ba3d7c624b
Add code formatting 2016-07-09 16:02:29 +02:00
Elias Probst
b3409c97a2
Fix typo (seens → seen) 2016-07-09 16:02:16 +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
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560) 
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
 2016-07-08 17:15:27 -04: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
91e0656d44 Merge pull request #34531 from terminalmage/issue34397 
Support ignore_epoch argument in version comparisons
 2016-07-08 10:43:36 -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
rallytime
815c8b38d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-08 10:34:32 -06:00
Mike Place
e99befad47 Merge pull request #34545 from terminalmage/docker-exec-driver 
Handle cases where Docker Remote API returns an empty ExecutionDriver
 2016-07-08 10:34:30 -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
7120d43df0 Merge pull request #34546 from rallytime/rename-boto-secgroup-test 
Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test
 2016-07-08 10:16:42 -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
rallytime
f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test 2016-07-07 21:29:36 -06:00
Erik Johnson
dd5838e242 Handle cases where Docker Remote API returns an empty ExecutionDriver 
Also fix some poorly-formatted RST in the docstring.
 2016-07-07 21:54:46 -05: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