Commit Graph

69080 Commits

Author SHA1 Message Date
Nicole Thomas
96a3d4e556 Merge pull request #32787 from rallytime/bp-32722
Back-port #32722 to 2015.8
2016-04-25 09:19:21 -06:00
Nicole Thomas
36f70f5847 Merge pull request #32786 from rallytime/bp-32703
Back-port #32703 to 2015.8
2016-04-25 09:19:13 -06:00
Nicole Thomas
c842e1e437 Merge pull request #32776 from rallytime/merge-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2016-04-25 09:18:12 -06:00
C. R. Oldham
a03630233d Merge pull request #32769 from rajvidhimar/junos-grains
Fix facts grain.  Test failures unrelated.
2016-04-25 07:44:55 -06:00
rajvidhimar
1db90300bd fix lint 2016-04-25 12:04:35 +05:30
Colton Myers
6d1b9f3630 Add a salt-ssh config to use homedir RSA keys (#32807)
New config option defaults to False. If set to True, salt-ssh will look
first for ~/.ssh/id_rsa and use that key for default authentication if
it exists.
2016-04-24 19:53:32 -06:00
Manuel Torrinha
3be72203e0 Update http_yaml.py
Drop url default value
Fixed comment on config, remainder from original code copied from Foreman external pillar
sugestion from PR 32741 - https://github.com/saltstack/salt/pull/32741
2016-04-23 22:51:31 +01:00
Nicole Thomas
95cac5665f Add code-block directives for bash-label formatting (#32797) 2016-04-23 09:16:07 -06:00
dollarampersand
f64df017a4 hardcoded family in negative position calculation (#32793)
Position calculations are incorrect for IPv6 rules due to hardcoded family
2016-04-23 08:46:27 -06:00
Anthony Shaw
fd65c47144 Libcloud DNS execution module (#32694)
* PSGet module for managing powershellgallery.com packages

* Linting fixes

* Converted docstrings to sphinx format

* Added libcloud_dns execution module for managing DNS

* Fix line endings and whitespace

* Clean line endings @cachedout
2016-04-23 08:42:42 -06:00
Thomas Jackson
3943aa37b1 Fix typo in thorium, keeping it from working (#32791) 2016-04-22 16:19:07 -06:00
Martin Paulus
6d94ecfb72 doc fix: correct CLI example for dnsmasq fullversion fun (#32788) 2016-04-22 14:59:47 -06:00
Nicole Thomas
7ecbf9f885 Merge pull request #14 from whiteinge/runner-async-low
Format low data correct for runner_async
2016-04-22 14:57:45 -06:00
Seth House
211f7b4af1 Format low data correct for runner_async 2016-04-22 14:36:41 -06:00
Brad Thurber
8d7148d41b Catch up the conf/master file to include gitfs/git_pillar parms from recent releases 2016-04-22 13:34:21 -06:00
Shammah Chancellor
baa4df25c9 Make example top file match templated version
Currently the example top file under "Matching Grains in the Top File" has
node_type grains whose values do not match the names of the states which
they specify.  (e.g. the `webserver` node_type specifies the `web` state).  
Later these values are templated using jinja templates as if they are identical.

This commit adjusts the values in the example to be identical, so that the 
template example follows naturally.
2016-04-22 13:32:56 -06:00
Erik Johnson
a6a4274021 Merge branch 'pr-32775' into 2015.8 2016-04-22 14:05:32 -05:00
Erik Johnson
227ef4aabb Fix unnecessary capitalization 2016-04-22 14:05:03 -05:00
Erik Johnson
73cd9f26c3 Merge branch 'gitfs_perremote_doc_updates' of https://github.com/l2ol33rt/salt into pr-32775 2016-04-22 14:04:18 -05:00
Moe
48e5ada949 Add pending reboot check to win_system (#32767)
* Add pending reboot check to win_system

* Fix pylint issue in get_pending_reboot function
2016-04-22 12:56:32 -06:00
Alejandro Bednarik
af64c95593 Append failed cmd in comments. (#32651)
When onlyif fail, append the message to comment so we know which command
is failing. Only in a list context.

Fixes #32575.
2016-04-22 12:54:58 -06:00
Anthony Shaw
9f1f472048 Execution module for PSGet ( the powershell module management library ) (#32687)
* PSGet module for managing powershellgallery.com packages

* Linting fixes

* Converted docstrings to sphinx format

* Update LF

* arbitrary change to reset the build
2016-04-22 12:54:02 -06:00
Carlos Perelló Marín
9d028262f4 Server Density agentv2 support (#32772)
* Added support for the agentv2

* Updated os field to match the SD API requirement

* filename is an absolute path on official installations

* Install script URL uses a redirect now, so we should instruct curl to follow them

* Added a missing import

* Updated the settings for the v2 agent

* Fixed pep8 issues

* select v2 agent for the test
2016-04-22 12:50:03 -06:00
Erik Johnson
cda00f4f93 Improve documentation on pygit2 versions (#32779)
This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.
2016-04-22 12:47:57 -06:00
rallytime
ce72851861 Merge branch '2014.7' into '2015.5'
Conflicts:
  - salt/netapi/rest_tornado/__init__.py
  - salt/netapi/rest_tornado/saltnado.py
2016-04-22 10:24:06 -06:00
Kai Howelmeyer
20c2cf176b Add max_depth parameter to file.directory, fixes #31989 (#32463) 2016-04-22 10:11:58 -06:00
Seth House
2775edc176 Saltnado /run fix (#32590)
* Revert "Verify auth in saltnado run (#32552)"

This reverts commit b19c5a5ce7.

* Call runner.cmd_async instead to enforce eauth

* Check for both token or user/pass before giving to Salt

* Remove comment as we're now enforcing auth here

* Lint and functionality fix courtesy of Mike P.

* Don't fail the whole request if there's an eauth problem
2016-04-22 10:10:47 -06:00
Robert James Hernandez
b69d406ada Including name per-remote config option in example 2016-04-22 09:07:10 -07:00
Julien Cigar
b6a8cb09fc Remove check_or_die for venv_bin (#32713)
While it sounds a good idea to check wether the venv_bin exists or not, due to
the implementation of salt.utils.which it fails if the command contains
arguments, for example "/usr/local/bin/python3.4 -m venv":

2016-04-20 12:56:46,564 [salt.state
][ERROR   ][45709] An exception occurred in this state: Traceback (most recent
call last):
  File "/usr/local/lib/python2.7/site-packages/salt/state.py", line 1594, in
call
    **cdata['kwargs'])
  File "/usr/local/lib/python2.7/site-packages/salt/loader.py", line 1491, in
wrapper
    return f(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/salt/states/virtualenv_mod.py",
line 169, in managed
    use_vt=use_vt,
  File "/usr/local/lib/python2.7/site-packages/salt/modules/virtualenv_mod.py",
line 117, in create
    salt.utils.check_or_die(venv_bin)
  File "/usr/local/lib/python2.7/site-packages/salt/utils/__init__.py", line
804, in check_or_die
    raise CommandNotFoundError(command)
CommandNotFoundError: /usr/local/bin/python3.4 -m venv
2016-04-22 10:03:45 -06:00
Moe
533194fb2a Add certificate binding to win_iis (#32700)
* Add certificate binding functionality

* Fix F12 in doctring
2016-04-22 10:00:50 -06:00
Thomas S Hatch
97b0325f0b Merge pull request #32702 from garethgreenaway/thorium_checks_changes
Adding some additional checks to thorium/check.py
2016-04-22 09:53:43 -06:00
Jason Friedrich
afd7388569 Fix issue where pyVmomi 6.0.0 raises SSL errors on Debian 8.3 (#32760)
Related: #29537

The error message for a bad handshake due to a private certificate has
changed slightly (uppercase/lowercase). This additional if statement
fixes the issues and allows connectivity with a self-signed certificate.
2016-04-22 09:21:01 -06:00
Anthony Shaw
00511ea976 Fix suse libcloud support/hack (#32744)
* Fix suse libcloud support/hack

* fix line endings

* fix line endings in gce
2016-04-22 09:18:42 -06:00
Alejandro Bednarik
66ba35261c Archive extracted perms update. (#32765)
As described in #32753 archived.extracted chnages more permissions that they
should. Since if_missing is None, name is assigned to this variable, this
chnage will help not updating files/dirs permissions outside the actual extracted file.
2016-04-22 09:17:11 -06:00
Dmitry Kuzmenko
1d6d234417 Properly handle minion failback failure. (#32749)
* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test
2016-04-22 09:15:55 -06:00
Ryan Lane
9bf18083fb Confidant sdb and ext_pillar support (#32757)
* Add an SDB module for confidant

* Add confidant external pillar

* Add docs
2016-04-22 09:12:15 -06:00
Daniel Wallace
ef5305a23b Allow for specifying not using the random module (#32763)
The Random module can lead to non alpha numeric characters in the
password.  Since we also use this for creating the salt, some devices
cannot have these extra characters in their salts, so allow to turn this
feature off as needed.
2016-04-22 09:05:53 -06:00
Martin Hoefling
616e1b15cc Celery task execution module (#32766) 2016-04-22 08:56:02 -06:00
Denys Havrysh
3751a270d7 Document pillar cache options (#32643)
* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job
2016-04-22 08:54:30 -06:00
Jorge Schrauwen
ed89a6cb0c fixes issue #32748 (#32770) 2016-04-22 08:38:56 -06:00
rajvidhimar
d7a49e42b9 fix facts grain 2016-04-22 11:56:46 +05:30
Nicole Thomas
64d64af443 Pylint fix for develop branch (#32756) 2016-04-21 11:31:15 -06:00
Nicole Thomas
c0c81a8a9d Make some small doc improvements for the servicenow module (#32754) 2016-04-21 11:30:29 -06:00
Nicole Thomas
258aa6acf7 Add version tag to new pcs state module (#32755) 2016-04-21 11:28:02 -06:00
Anthony Shaw
d9b82450ba Added servicenow execution module (#32725)
* Added servicenow execution module

* Fixed up the linting

* Fix docstrings
2016-04-21 10:55:57 -06:00
Holger Fischer
be136832d5 rename some functions to follow best practices (#32728) 2016-04-21 08:45:57 -06:00
Justin Findlay
35c8af3ece modules.win_dacl: consistent case of dacl constants (#32720) 2016-04-21 08:39:23 -06:00
Erik Johnson
67d0c81184 Support remote sources in a source list (#32691)
* Support remote sources in a source list

This commit modifies the source_list check so that remote sources
(http(s), ftp, etc.) are not fetched more than once. To do so, it
adds the use of ``__context__`` in ``cp.cache_file`` and
``file.source_list`` to prevent multiple fetches of a single file in the
same salt run.

* Update tests

Added __context__ to test cases to reflect usage of __context__, and
also added file.source_list to mocked funcs for archive.extracted unit
test.
2016-04-21 08:37:38 -06:00
Thomas Jackson
e08f73fbf0 Call utils method which imports the fastest json we can find (#32729)
This will end up being significantly faster assuming we can find one
2016-04-21 08:34:36 -06:00
Boris Feld
2cd08177be Update external auth documentation to list supported matcher. (#32733)
Thanks to #31598, all matchers are supported for eauth configuration.
But we still have no way to use compound matchers in eauth configuration.
Update the documentation to explicitly express this limitation.
2016-04-21 08:33:50 -06:00