valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,816 Commits 24 Branches 182 Tags 341 MiB
16f35244f8
Commit Graph

76816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
16f35244f8 Merge pull request #38378 from rallytime/git-deprecations 
Remove functions and arguments in git state and execution module
 2016-12-22 09:47:10 -07:00
Mike Place
87d30a25d8 Merge pull request #38397 from skizunov/develop2 
Let IOLoop run other tasks between connection attempts
 2016-12-22 09:39:28 -07:00
Mike Place
fb8b5d2d46 Merge pull request #38399 from skizunov/develop3 
Fix exception when `event.fire_master` used without connection
 2016-12-22 09:36:27 -07:00
Mike Place
d10e3ece5a Merge pull request #38404 from terminalmage/pillarenv 
Add config option to pin pillarenv to effective saltenv
 2016-12-22 09:34:19 -07:00
Mike Place
6c0b27bf99 Merge pull request #38405 from hvnsweeting/influxdb-rp-cq 
Add support for InfluxDB continuous queries and retention policy
 2016-12-22 09:30:54 -07:00
Mike Place
866ad86774 Merge pull request #38408 from cloudflare/FIX-DOCS 
Fix docs for net.load_template and netconf state
 2016-12-22 09:27:11 -07:00
Mike Place
9016ae0ea2 Merge pull request #38411 from martin-helmich/bugfix/issue-18983 
authorized_key entry is not updated when options contain whitespace
 2016-12-22 09:25:20 -07:00
Martin Helmich
2bc630d0df authorized_key entry is not updated when options contain whitespace 
The `ssh.set_auth_key` module does not update an authorized key when the key options contain a whitespace.

This is because the `_replace_auth_key` helper method simply splits the line by whitespace using `.split()` and assumes the key type to be present as the second item. This does not work when the key options contain whitespaces.

Fixes: #18983
 2016-12-22 13:22:23 +01:00
Mircea Ulinic
5123f115b7
Update net.load_template doc: 2016.11.2 2016-12-22 09:23:49 +00:00
Mircea Ulinic
089f704b40
Return changes loaded when debug 2016-12-22 09:23:45 +00:00
Erik Johnson
dde66d3705 Add pillarenv support to pillar.get 2016-12-22 01:02:44 -06:00
Hung Nguyen Viet
d97201b478 Add support for InfluxDB continuous queries and retention policy 2016-12-22 12:47:34 +07:00
Erik Johnson
d744ad7f46 Make pillar.items support pillarenv and pillarenv_from_saltenv 2016-12-21 22:34:28 -06:00
Erik Johnson
4049bf7288 Add pillarenv_from_saltenv to Nitrogen release notes 2016-12-21 19:54:48 -06:00
Erik Johnson
475981f9d0 Add pillarenv support to state.top 
Also fix some incorrect saltenv/pillarenv behavior in some of the other
funcs, and expand documentation for functions that support pillarenv but
contain no documentation that it is supported.
 2016-12-21 19:53:53 -06:00
Erik Johnson
f66d2a9603 Add pillarenv_from_saltenv to salt.pillar 2016-12-21 19:50:08 -06:00
Erik Johnson
1fd9c716d9 Add pillarenv_from_saltenv minion config parameter 2016-12-21 19:49:32 -06:00
Sergey Kizunov
d7fe0a87e3 Fix exception when event.fire_master used without connection 
When `event.fire_master` is invoked (via beacon, module, etc) and
there is no connection to the master (eg `'master_type': 'disable'`,
`beacons_before_connect`, etc), an exception is invoked. Prevent
the exception from occurring.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-12-21 15:46:03 -06:00
Mike Place
4d05dc5337 Merge pull request #38396 from gtmanfred/develop 
add travisci module
 2016-12-21 14:01:37 -07:00
Sergey Kizunov
6c8b8048e6 Let IOLoop run other tasks between connection attempts 
Between connection attempts, sleep for a small duration to allow
the IOLoop to run any other scheduled tasks in the case when the
system is configured for multiple or infinite connection attempts. An
example of when this is useful is when the connection failure is due
to DNS lookup, and in such a case the IOLoop will never get a chance
to run any other scheduled tasks. If we hope to run other tasks (such
as when `beacons_before_connect` or `scheduler_before_connect` is
`True`), this will give the IOLoop the opportunity to do so.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-12-21 13:52:53 -06:00
rallytime
09a76a0a97 Remove functions and arguments in git state and execution module 
These were all marked for removal in Nitrogen
 2016-12-21 11:55:18 -07:00
Daniel Wallace
05574d4770 add travisci module 
Used to verify webhook post requests came from travis
 2016-12-21 12:42:09 -06:00
Mike Place
e9a8b80f14 Merge pull request #38345 from bbinet/influxdb-user-grants 
Add support for granting privileges in influxdb_user.present
 2016-12-21 11:28:23 -07:00
Mike Place
a21354dff1 Merge pull request #38379 from rallytime/event-utils-deprecations 
Remove use_pending and pending_tags from salt.utils.event.get_event function
 2016-12-21 11:26:48 -07:00
Mike Place
5b6e31d6fc Merge pull request #38380 from rallytime/glusterfs-deprecations 
Remove deprecated functions from glusterfs state and module
 2016-12-21 11:25:47 -07:00
Mike Place
f73705dea0 Merge pull request #38383 from kai4785/feature/allow-openvswitch-internal-ports 
Fixing white space issue with cmd, and making internal default to False
 2016-12-21 11:25:02 -07:00
Mike Place
547ab237c9 Merge pull request #38387 from whiteinge/nodegroup-roles-doc-rm 
Add match.search_by function
 2016-12-21 11:23:46 -07:00
Erik Johnson
ec856493f9 Fix traceback when pillarenv is used (#38381) 
This issue only appears in the develop branch, so no backporting is
needed.
 2016-12-21 09:14:56 -07:00
Seth House
683d5c043d Add match.search_by execution function as an inverse of match.filter_by 2016-12-20 23:21:17 -07:00
Seth House
cad64a9264 Remove retrieving roles from nodegroups from docs as anti-pattern 2016-12-20 22:43:56 -07:00
rallytime
e13d514294 Remove unused import 2016-12-20 17:28:30 -07:00
Kai Meyer
64b64f9ee7 Fixing white space issue with cmd, and making internal default to False 2016-12-20 16:06:06 -07:00
rallytime
7ecd4e6e1b Remove deprecated functions from glusterfs state and module 2016-12-20 15:09:54 -07:00
rallytime
efc5378f3d Remove use_pending and pending_tags from salt.utils.event.get_event function 2016-12-20 15:01:40 -07:00
Mike Place
a9c2618c89 Merge pull request #38360 from rallytime/deprecate-apache-states 
Remove enable/disable funcs from apache_* states
 2016-12-20 13:37:14 -07:00
Nicole Thomas
a380c12159 Merge pull request #38375 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-20 11:57:39 -07:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
rallytime
d2be3844a3 Pylint fix 2016-12-20 09:30:55 -07:00
Mike Place
6e5d8669cf Merge pull request #38349 from mateiw/develop-salt-ssh-options-param 
Add --ssh-option to salt-ssh
 2016-12-20 09:19:35 -07:00
Mike Place
662d8d64a8 Merge pull request #38166 from rallytime/cloud-deprecations 
Remove support for "provider" in cloud provider configs
 2016-12-20 08:06:19 -07:00
Mike Place
530f495955 Merge pull request #38073 from doublescoring/2016.11 
2016.11
 2016-12-20 07:51:10 -07:00
Mike Place
df462cbe3e Merge pull request #38212 from disaster123/develop_zmq_backlog 
ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog)
 2016-12-20 07:41:42 -07:00
Mike Place
2416304c88 Merge pull request #38296 from nevins-b/issue-38239 
Issue 38239
 2016-12-20 07:08:03 -07:00
Bruno Binet
6a9126f69f Fix lint warning 2016-12-20 15:05:52 +01:00
Mike Place
67908d5aba Merge pull request #38344 from bbinet/fix-influx-createdb 
Fix influxdb_database.present state
 2016-12-20 06:57:45 -07:00
Mike Place
e647efe37d Add space around equality operator 
Needed for lint
 2016-12-20 06:51:09 -07:00
Mike Place
9cd7b72442 Merge pull request #38359 from rallytime/remove-PidfileMixin 
Remove PidfileMixin as it is deprecated for removal in Nitrogen
 2016-12-20 06:48:20 -07:00
Mike Place
9350808fea Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist 
Remove support for client_acl and client_acl_blacklist
 2016-12-20 06:33:23 -07:00
Mike Place
5d497451cd Merge pull request #38362 from kai4785/feature/add-redhat-nm-controlled 
Add NM_CONTROLLED to redhat configured interfaces
 2016-12-20 06:31:10 -07:00
Mike Place
af286c1e89 Merge pull request #38363 from kai4785/feature/allow-openvswitch-internal-ports 
Allow the creation of an internal interface for an openvswitch port
 2016-12-20 06:30:23 -07:00