Commit Graph

68830 Commits

Author SHA1 Message Date
Kai Howelmeyer
20c2cf176b Add max_depth parameter to file.directory, fixes #31989 (#32463) 2016-04-22 10:11:58 -06: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
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
Martin Hoefling
616e1b15cc Celery task execution module (#32766) 2016-04-22 08:56:02 -06:00
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
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
Mircea Ulinic
b1dbcd064d HipChat to use custom API (#32708)
* HipChat to use custom API URL

* Support api_url in all methods

* DOC: HipChat api_url
2016-04-21 08:33:09 -06:00
lomeroe
2bf3b7f0af set record_type to lowercase as api is case sensitive (#32734) 2016-04-21 08:30:24 -06:00
Seth Miller
6c65487789 Add ability to set server state for HAProxy (#32735) 2016-04-21 08:26:35 -06:00
David Boucha
25497a208b Add period to Tom's middle initial (#32730) 2016-04-21 08:24:08 -06:00
Dan Neff
37157425c0 includes warning to resolve issue 31862 (#32736)
Adds WARNING to push documentation identifying permissions issue. The
warning is consistent with the `mdadm` module warning.
2016-04-21 08:18:26 -06:00
Damian Myerscough
100a09f7b0 Configure script name (#32742) 2016-04-21 08:05:04 -06:00
Moe
640120eaa8 Fix docstring typo/formatting (#32726) 2016-04-20 18:46:07 -06:00
Eric Radman
84b740e26d Skip utils_test if timelib is not installed (#32699)
date_cast() throws a RuntimeError, not an ImportError
2016-04-20 14:01:21 -06:00
garethgreenaway
973711e92f Handle the situation when the beacon is not configured and we try to disable it (#32695) 2016-04-20 14:00:18 -06:00
Joseph Hall
6ab0a0ea3e Allow EC2 userdata to be templated (#32698)
* Allow EC2 userdata to be templated

* Forgot an import
2016-04-20 13:51:56 -06:00
Nicole Thomas
f86e37877f Merge pull request #32722 from bradthurber/catchup-conf-master-file
Catch up the conf/master file to include gitfs/git_pillar parms from …
2016-04-20 13:50:24 -06:00
Brad Thurber
fcd590291b Catch up the conf/master file to include gitfs/git_pillar parms from recent releases 2016-04-20 15:06:44 -04:00
Nicole Thomas
da7f75713f Merge pull request #32703 from schancel/patch-1
Make example top file match templated version
2016-04-20 10:54:14 -06:00
Shammah Chancellor
6b7eed3c1c 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-19 22:21:47 -07:00
Gareth J. Greenaway
5a40fe9ba7 Adding some additional checks to thorium/check.py 2016-04-19 18:02:29 -07:00
Nicole Thomas
cc18f24b44 Merge pull request #32696 from rallytime/lint-32689
Lint #32689
2016-04-19 15:54:50 -06:00
rallytime
7aa927b03a Fix whitespace for #32689 2016-04-19 15:35:51 -06:00
Anthony Shaw
453cf3b97a Fix lint added version info 2016-04-20 05:23:01 +10:00
Nicole Thomas
773d3f68dc Merge pull request #32688 from nmadhok/patch-1
Update intro_scale.rst
2016-04-19 13:14:45 -06:00
anthony-shaw
12c98f069a
Added an app pool restart command 2016-04-20 03:46:20 +10:00
Nitin Madhok
44765bc785 Update intro_scale.rst 2016-04-19 11:41:05 -06:00
captaininspiration
8c0858a1b6 Fix routes for redhat < 6 (#32682) 2016-04-19 09:47:17 -06:00
Alejandro del Castillo
74d65523c7 tune_in: do not fire master event in standalone minion mode (#32653)
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2016-04-18 10:51:10 -06:00
Nicole Thomas
992c70dc6a Update the minion.rst file with the new pub_ret option (#32654)
Also added the loop_interval docs to minion.rst and corrected
the default documented (this value is 1 second for the minion
schedule maintenance process, not 60 seconds - the master is 60).
2016-04-18 10:51:01 -06:00
Mike Place
422f66b2dc A configuration option to disable job returns (#32623)
In some cases, minions do not need to return a job for a master,
such as installations where jobs are run asynchronously and a 3rd-party
system evalutes a job cache to determine the results of a job.
2016-04-18 09:41:58 -06:00
Javier Bértoli
9cae281a3d varstack as master top (#32572)
* Add varstack as a master tops provider

* File modes

* Add ref/tops/all/salt.tops.varstack.rst

* Linting

* Linting

* Remove unused variable

* More linting

* PEP8 compliance
2016-04-18 08:58:53 -06:00
Kevin Quinn
d17dc38a73 Remove trailing newline in ssh.user_keys() (#32628) 2016-04-18 08:55:09 -06:00
Nitin Madhok
97b0e360b0 Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32642) 2016-04-18 08:47:27 -06:00
Nicole Thomas
9942ea9319 [develop] Merge forward from 2016.3 to develop (#32636)
* Ensure rh_service not used on CloudLinux 7

Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7

* Fix binary search and replace (#32542)

* Don't return None from eval_master (#32555)

Raise an exception instead. Because eval master if returns should return
a tuple.

* redact passwords and hashes from user.present updates

Fixes #32381

* Better log message on minion restart if master couldn't be reached. (#32576)

* Revert PR #32480 and apply #32314 with fixes / documentation (#32558)

* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock

* Fix comments value in salt.states.pkgrepo example (#32604)

'comments' option adds '#' automatically. Example contains `#http://mirror.centos.org/centos/$releasever/os/$basearch/` string which becomes prefixed with '##' in generated file.

* alphabetize directories for dynamic modules (#32599)

Also add engines and proxy minions to the list.

* Expand on the open-source vs open-core FAQ

* Language clarification.

* Fix some mistakes in the salt-ssh thin shell script (#32583)

* [[ is bash, not compatible with /bin/sh

* check if python command exists before calling it

* Deprecate 'user' and 'group' in state cmd (#32613)

* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release

* Fix mac_service and mac_system modules (#32587)

* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
2016-04-18 08:40:20 -06:00
Tom Williams
954b44c4e4 Add ability for boto_route53.present() to magically figure out the IP address for 'value' (#32644)
* ip_protocol.isdigit() fails when isinstance(ip_protocol, int)

* Fix """Warnings: 'name' is an invalid keyword argument for
'boto_iam.account_policy'. If you were trying to pass additional
data to be used in a template context, please populate 'context'
with 'key: value' pairs. Your approach will work until Salt Carbon
is out. Please update your state files."""

* Add boto_iam.get_all_users() module function

* Add boto_iam.get_all_groups() module function

* Update boto_iam.export_users() to use new get_all_users() function

* Add boto_iam.get_all_roles() module function

* Finally got around to implementing image_name option to boto_ec2.instance_present :)

* Add boto_secgroup.get_all_security_groups() function
Add options public_ip, allocation_id, and allocate_eip to boto_ec2.instance_exists()
Add option release_eip to boto_ec2.instance_absent()

* Boy, I REALLY disagree with PEP about the whole "whitespace after/before braces/brackets/parens" readability thing....

* INFRA-856 - add 'private:<Name tag>' and 'public:<Name tag>' flavors to boto_route53.present() 'value' option to allow route53 to automatically figure out IPs of freshly created instances

* INFRA-856 - add in_states argument so we only get back useful instances

* INFRA-856 - ...aaaaand boto arbitrarily maps PublicIpAddress to ip_address, while mapping EVERY OTHER instance attribute to it's immediate CamelCase->snake_case equivalents.  Helpful?  Not!  Brilliant?  NOT!
2016-04-18 08:37:36 -06:00
garethgreenaway
2eb556d5a8 Adding the ability to specify a trigger for the Slack engine (#32645) 2016-04-18 08:36:41 -06:00
garethgreenaway
db54457ca6 Adding the ability to the dockerng module and state module to specify a different Dockerfile when building an image. #32426 (#32648) 2016-04-18 08:30:30 -06:00
Jeremy McMillan
e25281fd20 Issue32626 macports Portfile upgrade to 2015.8.8.2 (#32629)
* This is the 2015.8.5 Portfile distributed by MacPorts

* version to 2015.8.8.2 and use osx pkg LaunchDaemon.plist resources for master, api, syndic
2016-04-16 11:35:07 -06:00
Nicole Thomas
21e55ccd60 Merge pull request #32621 from ezheidtmann/virtualbox-driver-importerror
Fix ImportError when using virtualbox cloud driver
2016-04-15 15:48:40 -06:00
Evan Heidtmann
9924b082fd Fix ImportError when using virtualbox cloud driver 2016-04-15 13:40:56 -07:00
ksvasan
c90bcfe1db Enable blocking on min_party until minimum set of nodes are available (#32592)
* Enable blocking on min_party until minimum set of nodes are available

* Fix the comment in min_party for salt-pr-lint-n

* Add test cases to the min_party method

* Fix the lint issues causing build failure

* Change the comment for test_min_party

* CR comments for modules/zk_concurrency.py

* Adding more examples for blocking/min_nodes

* Change the comment formatting

* Removing space at end of line

* Comments changes to rebuild
2016-04-15 13:35:29 -06:00