Commit Graph

68794 Commits

Author SHA1 Message Date
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
quantonganh
b6659b5b7d i32571-winrepo: saltenv is required to lookup the cache file (#32581)
* i32571-winrepo: `saltenv` is required to lookup the cache file

* `win_pkg` module: fix pep8 errors

* i32571-winrepo: purged/remove also need to know the `saltenv`
2016-04-15 12:23:06 -06:00
plastikos
9bb8d1cb5d Feature minion.restart (#32593)
* Add minion.restart

* Improve minion.kill for use by minion.restart

  + Add "retcode" status
  + Wait until the process dies (add timeout value)
  + Provide meaningful "comment" information when appropriate

* Add minion.restart: kills minion with minion.kill and then starts a new minion process

  + Can provide a specific ``minion_restart_command`` arg vector in minion configuration
  + If no ``minion_restart_command`` is available then uses ``argv`` of current process
  + If minion is not daemonized then it will kill but not restart - allows for
    direct management of minion by init, systemd or other direct process
    manager.

* Add EX_TEMPFAIL to exitcodes for timeout situtations (used by minion.kill)

TODO: integration tests

* Appease the pylint gods.

* Tweak the returned data structure for minion.kill.

* Seed the ``minion.kill`` ``killed`` entry with ``None.``
2016-04-15 12:19:11 -06:00
Thomas S Hatch
22c6895d63 Thormods (#32600)
* add basic runner caller to thorium

* add basic wheel module

* only start the reactor if it is configured and add it correctly to the engines

* fix lint and a syntax error I forget to get into the PR

* add break to speed things up a bit

* bah! whitespace!
2016-04-15 12:07:05 -06:00
Nicole Thomas
1673fbc790 Merge pull request #32596 from gtmanfred/fix_roles_nxos_user_state
strip extra whitespace from regex match on roles for nxos state
2016-04-15 09:32:27 -06:00
Nicole Thomas
a74ef5d701 Merge pull request #32594 from gtmanfred/develop
add nxos grains just like salt/grains/nxos.py
2016-04-15 09:31:56 -06:00
Nicole Thomas
826e04a90b Merge pull request #32597 from kraney/boto_lambda
added WaitForRole and RoleRetries to update_function_config
2016-04-15 09:31:33 -06:00
jacobhammons
ce0e7fadf1 Merge pull request #32598 from jacobhammons/mod-updates
Docs for this module are breaking the build
2016-04-14 16:25:19 -06:00
Jacob Hammons
517cdf7680 This module is making a call that is breaking the doc build, removing until I can figure it out. 2016-04-14 16:23:15 -06:00
Winston Liu
ccd8e10e84 added WaitForRole and RoleRetries to update_function_config to cover for case of a newly created Role 2016-04-14 14:46:49 -07:00
Daniel Wallace
b0962011b4 strip extra whitespace from regex match on roles 2016-04-14 16:38:12 -05:00
jacobhammons
2241ec537e Merge pull request #32595 from jacobhammons/mod-updates
Refreshes the doc module list
2016-04-14 15:29:23 -06:00
Jacob Hammons
2c74ac1f04 Refreshes the doc module list 2016-04-14 15:28:18 -06:00
Daniel Wallace
157013d09f add nxos grains just like salt/grains/nxos.py 2016-04-14 16:09:11 -05:00
Nicole Thomas
cd2581ff66 Merge pull request #32569 from one-hero/same-import-keypair
Added import_keypair method for DigitalOcean
2016-04-14 11:10:08 -06:00
Felix Hummel
6d38518560 mention /etc/salt/minion_id in docs explicitly (#32573)
This file is essential if one needs to change a minion's ID. Showing the
full path to the file makes it easier searching for it, e.g. Google::

    http://blog.mindfab.net/2013/11/salt-changing-minions-hostname.html
2016-04-14 10:36:28 -06:00
Justin Anderson
d53c907d07 Fixed lint failure in sqs_events (#32580) 2016-04-14 10:35:26 -06:00
Daniel Wallace
c08a553a21 make nxos module load init for multiprocess True (#32577)
This is required for test.ping to return True with `multiprocessing: True`
caused by the fact that the ssh connection has to be reconnected each
time the process is forked.
2016-04-14 10:35:10 -06:00
one-hero
36a16c9e30 Implemented code review requirements 2016-04-14 19:34:15 +03:00
Nicole Thomas
78bd479d6e Merge pull request #32547 from cro/opencorefaq
Expand on the open-source vs open-core FAQ
2016-04-14 09:50:26 -06:00
Nicole Thomas
04efcf52b6 Merge pull request #32560 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-04-14 09:44:39 -06:00
Nicole Thomas
4403367cf4 Merge pull request #32566 from one-hero/cloud-client-action-kwargs
Passing kwargs when creating mapper.
2016-04-14 09:06:15 -06:00
one-hero
f2cb38304d Added import_keypair method for digital_ocean. 2016-04-14 10:16:58 +03:00
one-hero
a59face80d Passing kwargs when creating mapper. 2016-04-14 09:16:16 +03:00
rallytime
efe3ec82da Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/glusterfs.py
  - salt/modules/service.py
  - tests/unit/modules/glusterfs_test.py
2016-04-13 16:10:33 -06:00
C. R. Oldham
5ce07fc1c6 Language clarification. 2016-04-13 15:13:37 -06:00
Theodore Cowan
b6d640da0d Allow sqs messages to be deserialized from json (#32557)
This engine is most useful if users could deserialize json messages, making the data within usable in reactors.  For example, messages from the CloudWatch Event system.
2016-04-13 15:09:35 -06:00
Nicole Thomas
778fbe00fa Add html_url to "min" dictionary that is returned for issues (#32549) 2016-04-13 15:09:11 -06:00
Daniel Wallace
6c3d7aa293 use defaults if opts doesn't have the keys either (#32550)
Fixes #32456
2016-04-13 15:08:58 -06:00
Nicole Thomas
7647f2f4f2 Merge pull request #32543 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-13 14:06:32 -06:00
Thomas S Hatch
c8facc5dae these are no longer loaded by the loader and proved to be (#32548)
more trouble that they were worth.
2016-04-13 12:55:54 -06:00
skizunov
b2ce8b5b72 PY3: salt-key --gen-keys fix (#32546)
`__init__.py`:
- On certain invocations of salt-key (seen when invoked programmatically
on Windows without going through the command interpreter `cmd.exe`),
`sys.stdin` is None. This has only been seen on Python 3. So
`encoding = sys.stdin.encoding` raises an exception in this case.

`utils/__init__.py`:
- `pem_finger` reads a file in binary mode. So in Python 3, the return
type is bytes and not str. Simple fix by using `b''.join` instead of
`''.join`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-04-13 12:55:04 -06:00
C. R. Oldham
8c88229aba Expand on the open-source vs open-core FAQ 2016-04-13 11:16:26 -06:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
2016-04-13 09:42:54 -06:00
Nicole Thomas
cce7de76b0 Merge pull request #32539 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-04-13 09:10:08 -06:00
rallytime
fbaeb165c9 Merge branch '2015.5' into merge-2015.8
No conflicts.
2016-04-13 09:07:39 -06:00
Nicole Thomas
7307bcb88e Merge pull request #32538 from rallytime/bp-32528
Back-port #32528 to 2015.5
2016-04-13 09:06:14 -06:00