Commit Graph

69080 Commits

Author SHA1 Message Date
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
Archie
f060ba903e Fix a typo (#33052) 2016-05-04 15:20:27 -06: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
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
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
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
Thomas S Hatch
8d02d33045 Merge pull request #32984 from jtand/pip3_support
Add pip3 support to pip module
2016-05-02 10:06:38 -06:00
Jorge Schrauwen
336236750f fix user cron on solarish operating systems (#32970)
* properly set cron entries on Solarish systems

* also fix write_cron_file(_verbose_

* minor tweak to make merging into 2016.3 and develop easier

* per @damon-atkins, be more restrictive with fpopen for the user crontab

* fix another small security hole by swapping fopen to fpopen + mode. fixed previous commit by switching back to 0600
2016-05-02 08:28:51 -07:00
Jorge Schrauwen
b196ff1191 #32966 dataset names should be case-sensitive (#32969) 2016-05-02 08:27:59 -07:00
Jεan Sacren
ad3b8b5b3d Add integration test for gentoolkit module (#32977) 2016-05-02 08:27:09 -07:00
Pedro Algarvio
1e8a2a18e6 Reset signal handling when restarting the minion. (#32963)
* Reset signal handling when restarting the minion.

This will avoid a hang on multiple failover masters on the 2nd restart.

This fix was hacked at +30000 feet. Kids, don't try this at home ;)

* Fix logging argument index. Switch to substitution.
2016-05-02 08:22:24 -07:00
Justin Anderson
96a86cb9b4 Add pip3 support to pip module 2016-05-02 09:02:29 -06:00
Nicole Thomas
502f6f8e36 fix versionadded for openvswitch module (#32957) 2016-05-02 08:57:37 -06:00
Anthony Shaw
af7593ae53 Introduce a lightweight unit test runner for execution modules (#32792)
* Added servicenow execution module

* Fixed up the linting

* Fix docstrings

* Setup basic unit test runner

* Setup basic loader mock and wrapper for declaring dependent packages

* Updated unit test runner and setup my first test example

* Update the servicenow module after a bad merge commit

* Code comments for the base unit test runners

* Fix linting issues

* remove empty line endings
2016-04-29 13:36:17 -07:00
Anthony Shaw
12a74c24a3 Cisco NSO Proxy Minion (#32911)
* PSGet module for managing powershellgallery.com packages

* Linting fixes

* Converted docstrings to sphinx format

* Update LF

* Added servicenow execution module

* Fixed up the linting

* Fix docstrings

* arbitrary change to reset the build

* Setup basic unit test runner

* Setup basic loader mock and wrapper for declaring dependent packages

* Updated unit test runner and setup my first test example

* Update the servicenow module after a bad merge commit

* Code comments for the base unit test runners

* Fix linting issues

* remove empty line endings

* Added Cisco NSO Proxy for PR review

* Added RST for autodoc of new module

* Fix from comments in PR review @rallytime

* Added execution module for NSO proxy

* Revert "Merge branch 'unittest' into cisco_nso"

This reverts commit b93c0aa6913fb90d35d8cbe94533160c91dcef1a, reversing
changes made to cd50386031d61cdb630f7ef169062be8b3de6912.

* Added state for check config present

* Added autodoc for new modules

* fix lint issues

* Do a diff on the values

* Fix linting issues
2016-04-29 14:10:23 -06:00
Joseph Hall
c6f0fcd5d8 Add caching loader, with msgpack module (#32953)
* Add caching loader, with msgpack module

* Update docstrings in loader

* Lint
2016-04-29 13:09:25 -07:00
onorua
3828837202 Make tornado raise error configurable (#32942) 2016-04-29 14:03:43 -06:00
AsocPro
4727d86e52 Add http_json external pillar (#32741) 2016-04-29 11:26:11 -07:00
Shane Lee
ae32f17b82 Add salt-config script to Mac Installer (#32873)
* Add script to configure salt

* Add salt-config.sh to installer scripts

* Add additional information to welcome/conclusion

* Fix text in conclusion

* Make salt-config.sh executable

* Create symlink to salt-config.sh

* Create minion.d directory

* Fix changed comparison to determine restart

* Add -f option to symlink creation
2016-04-29 11:01:20 -07:00
Justin Findlay
cc854f1464 update pip state and integration tests for newer pip versions (#32905)
* modules.virtualenv_mod: use correct pip bootstrap url

* modules.pip: raise error on mirrors arg

* states.pip: run mirrors test on < 7.0.0

* update pip integration test states to not use mirrors

* modules.pip: run mirrors tests on pip < 7.0.0
2016-04-29 10:49:29 -07:00
Nicolas Delaby
87b70186c3 When move a function to a new namespace, allow to keep original context. (#32943) 2016-04-29 10:48:20 -07:00
Justin Findlay
07e38bc9be salt.log.setup: process user args before format (#32796)
* salt.log.setup: process user args before format

Before:
    [DEBUG   ] too many %s
After:
    [DEBUG   ] too many secrets

* salt.log.setup: allow SaltLogRecord attrs on console
2016-04-29 10:47:01 -07:00
Seth House
08145bc2ec Add doc for ssl_chain (#32952)
Follow-up to the addition in #32941.
2016-04-29 11:43:27 -06:00
Mircea Ulinic
31fb04705b New state: NAPALM probes (#32947)
* NAPALM Probes state

* NAPALM Probes state doc
2016-04-29 10:43:15 -07:00
Nicole Thomas
041ed11db5 Use cmd_async instead of cmd when calling saltutil.revoke_auth (#32931)
Fixes #32896
2016-04-29 09:45:46 -07:00
Megan Wilhite
c57a2b8f3b Fix user present tests (#32895)
* fix user present tests for mac

* add setup and teardown methods

* add destructive and root decorators

* forgot teardown decorators

* fix pylint
2016-04-29 10:40:54 -06:00
jirikotlin, jiri.kotlin@ultimum.io
79a6dc890f OpenSSL.crypto.X509Extension object is not serializable (#32944) 2016-04-29 10:40:12 -06:00
cmclaughlin
187fcb236f Adding intermediate certificate support to rest_cherrypy (#32941)
This change configures cherrypy to use an intermediate certificate.
I did some manual testing to make sure it works... self-signed
certs (with no intermediate configured in the master conf) still work...
and I tested with a valid GoDaddy cert and their intermediate too.
2016-04-29 10:31:38 -06:00
N-Mi
5c31a0651f fix versionadded for openvswitch module (#32945) 2016-04-29 10:08:04 -06:00
brad-alexander
e7f7aa67d9 Add documentation for transport_opts (#32940) 2016-04-29 09:59:05 -06:00
Thomas S Hatch
91ed438999 Merge pull request #32802 from t0rrant/patch-2
Update http_yaml.py
2016-04-29 09:44:57 -06:00
Thomas S Hatch
e26044936d Merge pull request #32939 from thatch45/py3dec
Py3dec
2016-04-29 09:39:38 -06:00
Nicole Thomas
69ec98cc53 fix error in using alternate hash in py3 (#32937) 2016-04-29 09:37:51 -06:00
Nicole Thomas
1ff0995725 Merge pull request #32936 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-04-29 09:37:08 -06:00
Thomas S Hatch
c29c52a817 fix py3 error in rand_str 2016-04-28 19:17:22 -06:00
Thomas S Hatch
4f9ceda7f5 func_name is rthe same as __name__ in python2 2016-04-28 18:26:10 -06:00
Thomas S Hatch
e284eeb306 func_name does not exist on python3 2016-04-28 18:18:38 -06:00
Thomas S Hatch
fefb27964d get rid of inspect deprecation warnings (#32935)
* get rid of inspect deprecation warnings

* lint
2016-04-28 16:35:33 -06:00
Thomas S Hatch
df5b53b4e9 Merge pull request #32366 from thatch45/zmqpy3
Zeromq transport python3
2016-04-28 15:58:38 -06:00