Commit Graph

69171 Commits

Author SHA1 Message Date
Bo Maryniuk
cb40618262 Fire an event about released Zypper with its result 2016-04-27 10:04:32 +02:00
Bo Maryniuk
0728f0bc00 Replace string values with the constants 2016-04-27 10:04:15 +02: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
Bo Maryniuk
6af3f7141b Check if zypper lock exists and add more debug logging 2016-04-26 19:13:38 +02:00
Bo Maryniuk
0167b30a75 Add Zypper lock constant 2016-04-26 19:13:01 +02: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
Bo Maryniuk
370ff21d36 Fire an event to the Master about blocked Zypper. 2016-04-26 19:06:46 +02: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
Tom Williams
acb0c373be INFRA-856 - Expand handling of block_device_map in boto_ec2.run() to … (#32867)
* INFRA-856 - Expand handling of block_device_map in boto_ec2.run() to accept string and dict representations of device mappings.  Add boto_ec2.get_all_volumes() / create_tags() / detach_volume() / delete_volume().  Add state function boto_ec2.volume_absent().

* INFRA-856 - Fixed one PEP8 complaint, one missing variable def.
2016-04-26 10:29:21 -06:00
Bo Maryniuk
1727ca3de2 Use new Zypper call implementation 2016-04-26 18:03:34 +02:00
Bo Maryniuk
485164aa5c Remove blocking-prone Zypper call implementation 2016-04-26 18:02:53 +02:00
Bo Maryniuk
f161f0612c Implement block-proof Zypper call implementation 2016-04-26 18:02:17 +02:00
Seth House
e049eaaaf4 Add example using sessions in the requests library (#32854) 2016-04-26 09:59:05 -06:00
Bo Maryniuk
baf35ed708 Remove one-char variables 2016-04-26 17:58:26 +02:00
Bo Maryniuk
2c94eb016f Remove an unused variable 2016-04-26 17:57:09 +02:00
Bo Maryniuk
6869ebc557 Remove an empty line 2016-04-26 17:56:47 +02:00
Bo Maryniuk
7e06489da9 Remove verbose wrapping 2016-04-26 17:56:24 +02:00
Justin Findlay
aac1ae35c5 fix some shell tests for MacOS (#32852)
* auth.pam int test: use unhashed pw for MacOS

* shell tests: strip whitespace from shell return

Similar to 2f1c0cf.

* modules.mac_user.delete: update example for int test

integration.shell.call.CallTest.test_user_delete_kw_output expects this
exact string to be in the doc for user.delete:
```
salt '*' user.delete name remove=True force=True
```
2016-04-26 09:47:35 -06:00
Sergey Kizunov
e29f1df10b Fix for "TypeError: send() got an unexpected keyword argument 'raw'"
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-04-26 10:00:38 -05:00
lomeroe
2bd2bd1bbb backport #32732 to 2016.3 (#32851) 2016-04-26 08:40:24 -06:00
lomeroe
edce22a143 backport PR #32732 to 2015.5 fixes #23714 (#32848) 2016-04-26 08:39:53 -06:00
lomeroe
4bb5545cb4 backport PR #32732 for issue #23714 (#32847) 2016-04-26 08:39:35 -06:00
Bo Maryniuk
2131ff04af Standarize zypper call to "run_all" 2016-04-26 11:30:10 +02:00
Bo Maryniuk
046ef44ca3 Bugfix: version_cmp crashes in CLI if there are versions, that looks like integer or float. 2016-04-26 11:27:56 +02:00
Nicole Thomas
5ea003b387 Add pyvmomi version warning to Getting Started with VMware docs (#32845)
Fixes #32824
2016-04-25 16:46:51 -06:00
Mircea Ulinic
158e4ce888 Test import & proxy for napalm_network module (#32822)
* Test import & proxy

* Quotes replace

* Module NET
2016-04-25 16:12:42 -06:00
Justin Findlay
c93b551e9c fix lint for mac modules (#32842)
* modules.mac_keychain: remove unnecessary space in docstrings

* modules.mac_keychain.get_hash: add example to docstring

* modules.mac_user: protect sdecode from loader as _sdecode

* modules.proxy: add missing examples to docstrings
2016-04-25 15:48:56 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
2016-04-25 15:45:17 -06:00