Commit Graph

69292 Commits

Author SHA1 Message Date
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
Thomas S Hatch
f0a6bb44de fix error in using alternate hash in py3 2016-04-28 15:54:59 -06:00
Thomas S Hatch
f367a9e41b Tests run py3 (#32929)
* Zeromq transport python3

* lets toss this fix in here, so that we get exception messages

* got states working

This forces the serializer to deserialize into strings on py3
but also allows for the argument 'raw' to be passed in allowing
for raw bytes to be sent explicitly. I made it this way
because the majority of calls are operational and the fileclient
is the only thing that needs bytes from the master

* all channels need to absorb the new raw arg

* Soem redundancy cleanup

* fix up base class

* try some more...

* Fix for "TypeError: send() got an unexpected keyword argument 'raw'"

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>

* fix an issue where we are making unicode strings bytes for no good reason
2016-04-28 14:49:06 -07:00
Justin Findlay
b2d7c81f66 doc.ref.states.ordering: clarify requisite change (#32934) 2016-04-28 15:41:01 -06:00
rallytime
5952e3e300 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/mac_brew.py
  - salt/states/archive.py
2016-04-28 15:35:34 -06:00
Nicole Thomas
3f1faec755 Merge pull request #32932 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-28 15:30:17 -06:00
rallytime
9033060106 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/states/archive.py
2016-04-28 14:22:58 -06:00
Nicole Thomas
df41d5dfb1 mode should default to 'text' (#32928) 2016-04-28 14:16:19 -06:00
Justin Anderson
fa7e32afcc Fixing failures in gce_test and dimensiondata_test (#32921)
* Fixing failures in gce_test and dimensiondata_test

* Fixed lint
2016-04-28 14:15:22 -06:00
Nicole Thomas
f581a8218d Remove FileClient class references from docs - it doesn't exist. (#32925)
* Remove FileClient class references from docs - it doesn't exist.

Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.

Fixes #32646

* Don't reference minion import when not used
2016-04-28 14:14:40 -06:00
Nicole Thomas
31b96dec7b Update contents_grains option with relevant docs (#32922)
Instead of "works like contents_pillar". Also added grains example.

Fixes #23683
2016-04-28 13:49:07 -06:00
Nicole Thomas
e60c12640d Merge pull request #32926 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-04-28 13:47:52 -06:00
Mircea Ulinic
e207ab560e New execution module: napalm_bgp (#32920)
* NAPALM BGP execution module

* NAPALM BGP doc

* Small lint fix

* Small doc update
2016-04-28 13:47:15 -06:00
rallytime
5a184881be Merge branch '2015.5' into '2015.8'
No conflicts.
2016-04-28 12:33:10 -06:00
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
Nicole Thomas
85ca86de08 Update docs to warn users that -1 isn't valid for iptables insert state (#32906)
Fixes #23953

Also clarifies the append state doc to indicate that rules will
always be added to the end of a chain.
2016-04-28 10:14:28 -06:00
Nicole Thomas
cb68706db2 Allow profile options to be specified in provider file when using maps (#32900)
Fixes #32510
2016-04-28 10:07:14 -06:00
Shane Lee
7da7b2329d Remove _get_date_time_format function (#32903)
* Remove _get_date_time_format function

* Fix incorrect timelib version
2016-04-28 10:06:44 -06:00