Commit Graph

69080 Commits

Author SHA1 Message Date
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
steven 'haji' hajducko
98767d521d Reload renderers for local pillar after gitfs (#32912)
Because of the way the renderers are lazy loaded when using ext_pillar_first
and gitfs external pillar, the renderers for the local pillar object were
being set to the last loaded gitfs pillar.

This was causing the local pillar to fail to render.  This small fix
forces a reload of the renderers after all the external pillars are done
loading.
2016-04-28 09:57:25 -06:00
Robin
c3d2b90057 Add support for stop_signal, fixes #32858 (#32886)
* Add support for stop_signal, fixes #32858

This adds support for already existing functionality in docker-py.
Running systemd requires the signal SIGRTMIN+3 to shutdown properly,
this fix makes it possible to specify the signal.

* Adds documentation for stop_signal

* Changed stop_signal in CREATE_OPTS

Removed min_docker_py until that functionality has been fixed.
Added a 'versionadded' tag for stop_signal.

* Tried pleasing pylint...
2016-04-28 09:23:38 -06:00
Nicole Thomas
1a55fcb733 Clarify service state opening docs - uses 'service' virtualname (#32880)
* Clarify service state opening docs - uses 'service' virtualname

Fixes #30855

* Add a few more clarifications to service state docs

And link to service execution modules list.
2016-04-27 14:32:27 -06:00
Erik Johnson
0af498c5a7 Add dson renderer from SaltConf 16 presentation (#32894) 2016-04-27 11:19:22 -06:00
Erik Johnson
a98dea7503 archive.extracted: only manage user/group ownership when if_missing is a directory (#32893)
* Revert "Archive extracted perms update. (#32765)"

This reverts commit 66ba35261c.

* archive.extracted: only manage user/group ownership when if_missing is a directory

There might be a better way to properly enforce this this (such as using
os.chmod on each individual file), but the trouble with doing this right
now is that the archive functions for unzip and unrar do not return neat
lists of files, they just return the CLI output from the unzip/unrar
commands as a list of lines.

Fixes #32801.
2016-04-27 11:19:08 -06:00
Thomas S Hatch
9c7e5c1168 Merge pull request #9 from skizunov/zmqpy3
Fix for "TypeError: send() got an unexpected keyword argument 'raw'"
2016-04-27 10:57:07 -06:00
Nicole Thomas
20864cb6d9 Merge pull request #32883 from papertigers/mz-fix-carbon-returner
mode should default to 'text'
2016-04-27 10:47:06 -06:00
Nicole Thomas
e1b40b3b76 Merge pull request #32884 from terminalmage/fix-incorrect-deprecation-notice
Fix incorrect deprecation notice
2016-04-27 09:47:35 -06:00
Erik Johnson
b307c5452a Fix incorrect deprecation notice
The "deprecated" entry refers to when the deprecation path started, not
when the option will be removed.
2016-04-26 23:52:08 -05:00
Mike Zeller
a30b05894e mode should default to 'text' 2016-04-26 21:42:37 -07:00
Nicole Thomas
2b239ceb6d Merge pull request #32879 from Ch3LL/fix_mac_user_present_test
add /Users directory for mac minion in user present test
2016-04-26 16:33:25 -06:00
Nicole Thomas
bba4b760c2 Merge pull request #32877 from Ch3LL/fix_mac_pkg_latest
fix pkg.latest_version for mac_brew.py
2016-04-26 16:32:48 -06:00
Nicole Thomas
a146dd2f1f Merge pull request #32876 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-04-26 16:28:36 -06:00
Ch3LL
3520d496ba add /Users directory for mac minion in user present test 2016-04-26 15:32:11 -06:00
jacobhammons
a2921b9da0 Merge pull request #32878 from jacobhammons/salt-cloud
added note about updating the bootstrap script in salt-cloud using th…
2016-04-26 15:09:51 -06:00
Jacob Hammons
3887938727 added note about updating the bootstrap script in salt-cloud using the -u flag, removed the saltconf banner. 2016-04-26 15:08:59 -06:00
Ch3LL
4e81d7bd68 fix pkg.latest_version for mac_brew.py 2016-04-26 14:58:52 -06:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
2016-04-26 14:42:26 -06:00
Nicole Thomas
a4e4ff257b Merge pull request #32874 from basepi/issue_16196
Add ssh_use_home_key to master config docs/template
2016-04-26 14:20:58 -06:00
Nicole Thomas
395b7ad747 Merge pull request #32870 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-26 14:01:44 -06:00
Colton Myers
a9770fef24 Add ssh_use_home_key to master config docs/template 2016-04-26 13:53:12 -06:00
Nicole Thomas
c49495a410 Merge pull request #32872 from whiteinge/batch-orch-docs
Batch orch docs
2016-04-26 13:25:30 -06:00
Nicole Thomas
71db10fd2c Merge pull request #32869 from rallytime/fix-32861
Use correct config setting in cloud syndic docs
2016-04-26 13:13:21 -06:00
Seth House
e6540383a7 Document the batch kwarg added in #26355 2016-04-26 13:02:32 -06:00
Seth House
bf1f357bee Fix incorrect code sample bat -> batch 2016-04-26 12:40:45 -06:00
rallytime
e7a11cbe87 Pylint fix 2016-04-26 12:30:50 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
2016-04-26 12:07:42 -06:00
Nicole Thomas
02c681311f Merge pull request #32844 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-04-26 11:38:08 -06:00
rallytime
0e73daa126 Use correct config setting in cloud syndic docs
Fixes #32861
2016-04-26 11:32:01 -06:00
Damon Atkins
cf4826aad4 Windows Registry Unicode Support and PY2 character encoding (module.reg) (#32835)
* reg.py
* Start at PY3 support, however not tested against PY3
* Change to Unicode including from __future__ import unicode_literals
* If PY2 converts all parameter input unicode to local encoding i.e. Unicode to String
* If PY3 stays as Unicode as PY3 uses Windows Wide Char
* Supports non-asiic characters i.e. > 126
* All output is Unicode, before most of it was Unicode output
* Added a safty check to recursive delete to try and prevent a mistake like removing all of SOFTWARE
* Fixed all the pylint errors
* add _ prefix to internal functions
* Provided unit test see reg_win_test.py
reg_win_test.py
* All tests currently make real changes to the registry
* All changes are performed under SOFTWARE\SaltStackTest under HKEY_LOCAL_MACHINE and HKEY_CURRENT_USER
* Their is still room for more tests to be developed
* Test target the new Unicode features of reg.py e.g. Copyright, Tradmark and Register characters
* General the values set in the registy contain date/time and then checked that they are the current date/time to make sure they are not left over from old tests

* Update test unit to only run the tests on windows.
Removed some code which was commented out which is not required

* chmod 644 tests/unit/modules/reg_win_test.py
2016-04-26 11:07:04 -06:00
Justin Findlay
5a4398a746 netapi.rest_cherrypy: use unsalted PW on MacOS (#32850) 2016-04-26 11:04:25 -06:00
Nicole Thomas
eb8fb6b9df Back-port #31139 to 2015.8 (#32868)
* Evaluate %h and %u before deciding if the ssh config path is absolute

Since %h is the user's home directory, it's not very useful unless it
appears at the beginning of the path.  However, putting it at the
beginning of the path does not have the expected effect: %h/.ssh
will become /home/someuser/home/someuser/.ssh, since "%h/.ssh" is
identified by Python as a non-absolute path, causing the user's
home directory to be tacked on the front.

* Improved ssh_auth path expansion test
2016-04-26 10:44:01 -06:00
rallytime
1fc9de1d04 Add 'file.source_list' mock to archive state unit tests 2016-04-26 10:39:43 -06:00