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,797 Commits 24 Branches 182 Tags 341 MiB
2bc630d0df
Commit Graph

76797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Place
4d05dc5337 Merge pull request #38396 from gtmanfred/develop 
add travisci module
 2016-12-21 14:01:37 -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
Mike Place
2ed09a502a Merge pull request #38369 from hvnsweeting/fix-influxdb-command 
Fix wrong function names
 2016-12-20 06:29:05 -07:00
Viet Hung Nguyen
8d795c4472 Fix wrong function names 2016-12-20 19:06:32 +07:00
rallytime
7357e6ae11 Remove unused import 2016-12-19 17:15:58 -07:00
rallytime
142785d008 Pylint fix 2016-12-19 17:14:23 -07:00
Nicole Thomas
04d6898958 Merge pull request #38358 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-19 17:11:47 -07:00
Nicole Thomas
a8e2b026bc Merge pull request #38356 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-19 17:11:19 -07:00
Kai Meyer
43b2bec26f Allow the creation of an internal interface for an openvswitch port 
Openvswitch can create a virtual nic instead of only allowing existing
interfaces to be added. Once this virtual nic is created, it can be
managed by network.manage.

This patch allows me to configure a gre-tunnel private virtual network
for all my VMs, and then insert my host machine into that network.

br0:
  openvswitch_bridge.present

port0:
  openvswitch_port.present:
    - bridge: br0
    - type: vlan
    - id: 100
    - internal: true
  network.managed:
    - enabled: true
    - type: eth
    - ipaddr: 192.168.55.1
    - netmask: 255.255.255.0
 2016-12-19 16:51:29 -07:00
Kai Meyer
5c51c328e5 Add NM_CONTROLLED to redhat configured interfaces 
Some network interfaces (like openvswitch ports) are not backed by
physical devices, and NetworkManager barfs:

Error: Connection activation failed: No suitable device found for this
connection.

Preventing NetworkManager control to such a device will pass the control
to the other configuration tools, which operate 'ip' commands directly,
which do not suffer from this limitation.
 2016-12-19 16:51:00 -07:00
rallytime
a9f85f0dbe Remove support for client_acl and client_acl_blacklist 
These have been deprecated for some time and were marked for
removal in Nitrogen.

publisher_acl and publisher_acl_blacklist should be used instead.
 2016-12-19 16:18:48 -07:00
Nicole Thomas
48565fe2a8 Add missing CLI examples to grafana4 module (#38357) 2016-12-19 15:52:58 -07:00
rallytime
baf8f208eb Remove dup LXC doc reference 2016-12-19 15:49:37 -07:00
rallytime
810ed4a9cd Remove enable/disable funcs from apache_* states 
The apache_*.enable and apache_*.disable state functions are
deprecated in favor of apache_*.enabled and apache_*.disabled.
 2016-12-19 15:42:39 -07:00
rallytime
279cec88da Remove PidfileMixin as it is deprecated for removal in Nitrogen 2016-12-19 15:32:22 -07:00
rallytime
c6e191ad0d Remove doc markup references from 2016.11 branch 2016-12-19 15:14:37 -07:00
rallytime
513058945c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/states/requisites.rst
  - doc/topics/cloud/profitbricks.rst
  - doc/topics/cloud/vsphere.rst
  - doc/topics/releases/0.9.8.rst
  - doc/topics/releases/releasecandidate.rst
  - salt/cloud/clouds/vsphere.py
  - salt/minion.py
  - salt/states/archive.py
  - tests/unit/states/archive_test.py
 2016-12-19 14:58:39 -07:00
Erik Johnson
79231a5d8a archive.extracted: don't try to cache local sources (#38285) 
* archive.extracted: don't try to cache local sources

This will keep us from trying to cache file when we already have it
locally, which will help significantly with larger archives.

* Update tests to reflect change in cache behavior

* Add mock return for /bin/tar

This fixes failing tests for Ubuntu 14
 2016-12-19 14:37:58 -07:00
Nicole Thomas
a87fa91c7b Use correct import of salt.utils.event (not just "salt") (#38350) 
And add a versionadded tag to the new engine
 2016-12-19 14:15:43 -07:00
Erik Johnson
13414949e3 Merge pull request #37947 from vutny/fix-rhel5-minion-init 
Fix `salt-minion` initscript for RHEL5 (SysV) to pick up proper python version
 2016-12-19 15:03:49 -06:00
rallytime
8f80916432 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/topics/cloud/index.rst
  - salt/states/cron.py
 2016-12-19 14:00:52 -07:00