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
69,292 Commits 24 Branches 182 Tags 341 MiB
325befa557
Commit Graph

69292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Megan Wilhite
d48b2b8b52 test pillar.items output (#33060) 2016-05-05 06:51:27 -07:00
Jεan Sacren
398793bfc0 Fix minor document error of test.assertion (#33067) 2016-05-05 06:50:46 -07:00
jacobhammons
56acdbd559 Merge pull request #33065 from jacobhammons/mocks 
Mocks for salt.modules.junos, salt.proxy.junos, salt.renderers.dson, …
 2016-05-04 21:35:57 -06:00
Jacob Hammons
e4ceae56f5 Mocks for salt.modules.junos, salt.proxy.junos, salt.renderers.dson, salt.states.netntp, salt.proxy.napalm. Refs https://github.com/saltstack/salt/pull/32947 
Removes :exclude-members: from salt.states.netntp since Sphinx does not like this.
 2016-05-04 21:35:18 -06:00
jacobhammons
48e6ebac45 Merge pull request #33063 from jacobhammons/napalm-docs 
removes `:exclude-members:` from automodule
 2016-05-04 20:32:46 -06:00
Jacob Hammons
db9258cff2 It appears that sphinx chokes when :exclude-members: is included without any arguments. Refs https://github.com/saltstack/salt/pull/32947 2016-05-04 20:31:24 -06:00
Nicole Thomas
f97b5d5531 Back-port #33030 to 2015.8 (#33040) 
* When we restart the minion we should show the error that caused it

* looks better with a newline
 2016-05-04 15:18:43 -07:00
Justin Findlay
a78bbd0544 Update mac_assistive module for El Capitan (10.11) (#33047) 
* modules.mac_assistive int tests: wrap args in list

* modules.mac_assistive.install: match schema on El Capitan

* modules.mac_assistive: remove redundant LooseVersion

* modules.mac_assistive unit tests: mock __grains__
 2016-05-04 15:34:03 -06:00
Archie
f060ba903e Fix a typo (#33052) 2016-05-04 15:20:27 -06:00
Megan Wilhite
f8757631b2 Saltfile with pillar tests (#33045) 
* add file.managed with pillar data tests

* do not require git for other tests
 2016-05-04 14:37:57 -06:00
Thomas S Hatch
1d7892421e Backport #33021 manually to 2015.5 (#33044) 2016-05-04 14:34:29 -06:00
Nicole Thomas
c8740eea59 Merge pull request #33042 from thatch45/doc_req 
Add clarity on docs for require sls
 2016-05-04 12:25:20 -06:00
Nicole Thomas
6c69bac56f Merge pull request #33032 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-04 10:28:23 -06:00
Thomas S Hatch
813f27e807 Add clarity on docs for require sls 2016-05-04 10:18:19 -06:00
Nicole Thomas
e90a50142a Update the docs for saltutil.find_job to be more clear/accurate (#33017) 
* Update the docs for saltutil.find_job to be more clear/accurate

* Spelling fix
 2016-05-04 09:15:33 -07:00
Justin Findlay
186352a8b8 fix dimensiondata, gce unit test certs on MacOS (#33020) 2016-05-04 09:09:02 -07:00
Alexander Backlund
883aae73dc win_network.ping: add timeout and return_boolean (#33038) 
* win_network.ping: add timeout and return_boolean

* win_network.ping: divide timeout by tries

Divide timeout by tries to mimic BSD behaviour. Specifying
a timeout of 10 seconds would take a Windows minion four times
 longer than Linux to return when a target could not be reached.

* win_network.ping: minor doc formatting
 2016-05-04 08:55:23 -07:00
skizunov
64a0093b74 Fix Windows salt-master to not leave processes on CTRL-C (#33028) 
Sometimes, when the salt-master exits, it will leave some `MWorker`
processes running. When you try to restart salt-master, you will get
errors telling you that some ports are in use (due to the leftover
`MWorker` processes) and it will fail to fully start up.

salt/utils/process.py:
- In `ProcessManager.send_signal_to_processes`, on Windows don't
send the `SIGTERM` or `SIGINT` signals to subprocesses. The reason
is explained in the inline comments.
- In `ProcessManager.send_signal_to_processes`, rename arg `signal` to
`signal_` because it collides with module `signal` and breaks when
the `in` check was added to test if the signal is `SIGTERM` or `SIGINT`.
- On Windows, when `os.kill` fails because the process no longer exists,
`OSError` is returned with errno of `EACCES`, not `ESRCH` like on other
platforms. Modified the code to account for this.
- In `ProcessManager.kill_children`, only call `taskkill` from the main
process, not any sub-processes. It has been observed that occasionally
there are zombie `taskkill` processes left over, probably due to a race
condition when both are run simultaneously from different processes.
Since the main process will kill all the other process trees,
sub-processes don't need to do anything.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-05-04 08:54:41 -07:00
Thomas S Hatch
d6b6469fdd When we restart the minion we should show the error that caused it (#33030) 
* When we restart the minion we should show the error that caused it

* looks better with a newline
 2016-05-04 09:41:22 -06:00
Nicole Thomas
d3d77cea4a Add saltenv to the cmd.script state function (#33031) 2016-05-04 09:24:44 -06:00
rallytime
816f6a1fa3 Whitespce fix 2016-05-04 09:21:17 -06:00
James Peach
920bd6f9ce Use traffic_ctl in the trafficserver state and module. 
Traffic Server has deprecated traffic_line some time ago and subsumed
almost all of its functionality into traffic_ctl. This change checks
whether traffic_ctl is available and uses that in preference to
traffic_line.
 2016-05-03 20:14:44 -07:00
rallytime
9dd87111df Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/virtualenv_mod.py
 2016-05-03 16:34:39 -06:00
Mike Place
c548cf47fa Remove log grains (#33029) 
* Revert "Pack log handlers with grains and mods"

This reverts commit b5a92a5fc3.

* Revert "Remove unused import"

This reverts commit 601d9b7389.
 2016-05-03 15:13:55 -07:00
David Boucha
3434f44e3f Fix syndic regression (#33021) 
* fix tag syndic return packing

* check if jid dir exists first
 2016-05-03 13:32:11 -07:00
David Murphy
808bbc5a31 Refactoring automated signing due to PR review comments 2016-05-03 14:30:17 -06:00
David Murphy
255b2977e3 Missed debug intials 2016-05-03 14:30:17 -06:00
David Murphy
9428eafbf3 Fixup error message for Redhat make repository 2016-05-03 14:30:16 -06:00
David Murphy
5536d8cac2 Support for automated package signing building repositories 2016-05-03 14:30:16 -06:00
Thomas S Hatch
d81b82ed8b this blurb explains the syndic fixes, we should also have (#33022) 
this blurb in the release notes for the next 2015.8 point release
 2016-05-03 13:23:12 -06:00
Mike Place
6181bb46fa Fix salt-api and orchestration runner (#32997) 
* Fix salt-api and orchestration runner

This regressed in #27175. Fixed by putting retcode into data dict.

* Remove debugging.
 2016-05-03 10:52:36 -06:00
Shane Lee
4bb3ca5955 Compare uid and gid instead of name and group (#32674) 
* Compare uid and gid instead of name and group

* Gate the uid comparison
 2016-05-03 09:37:52 -07:00
Clint Armstrong
66ef7b9c6f add support for root option (#32972) 2016-05-03 09:36:30 -07:00
Alejandro del Castillo
1583af2b70 minion.py: add startup_states support to standalone minion (#33011) 
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2016-05-03 09:34:22 -07:00
Nicole Thomas
9ca5b02b0c Allow batch mode to use verbose option, as well as show_jid. (#32996) 
Fixes #32856
 2016-05-03 09:17:50 -07:00
Adam Tengler
81c0fa4d78 Fixed glusterfs.peered output (#32955) 
Fixed 'NoneType' object is not iterable and removed existing peers from newpeers list

Fixes #32954
 2016-05-03 08:57:35 -07:00
Nicole Thomas
f00b5f91b3 Add run_on_start docs to schedule.rst (#32958) 
Fixes #22580
 2016-05-03 08:56:06 -07:00
Justin Anderson
28ba98c613 Skip some tests related to #32902 (#32995) 2016-05-03 08:55:23 -07:00
Nicole Thomas
8c70d7a56b Clarify some arg docs (#32994) 
Fixes #26011

Also reorganizes some of the kwarg definitions so it's more
clear what is documented and what docs are missing.
 2016-05-03 08:54:28 -07:00
Carlos Perelló Marín
11ce37fcb3 privateIPs and privateDNS are expected to be JSON encoded strings (#32993) 2016-05-03 08:48:50 -06:00
Seth House
3fe2c58824 Add saltenv to the cmd.script state function (#33002) 2016-05-03 08:39:42 -06:00
Bo Maryniuk
1601a7e07a Prevent the use of "refreshable" together with "nolock" option. 2016-05-03 09:15:00 +02:00
Bo Maryniuk
52e1be2fa9 Remove unused variable in a constructor. Adjust the docstring accordingly. 2016-05-03 09:08:49 +02:00
Bo Maryniuk
7e00f566ef Move log message down to the point where it actually sleeps. Rephrase the message. 2016-05-03 09:05:16 +02:00
Bo Maryniuk
4b7dab83ff Fix PID file path for SLE11 2016-05-03 09:03:07 +02:00
Nicole Thomas
8690c5866c Merge pull request #32991 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-05-02 14:01:06 -06:00
rallytime
16c9ce70ad Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-05-02 12:58:24 -06:00
Nicole Thomas
111e927b69 Merge pull request #32987 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-02 12:56:51 -06:00
rallytime
c12b9a5094 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-05-02 10:50:27 -06:00
Justin Anderson
00fbeaba5f Fix boto_secgroup_test (#32986) 2016-05-02 10:46:19 -06:00