valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,369 Commits 24 Branches 182 Tags 341 MiB
a643340632
Commit Graph

77369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
a643340632 Add documentation for the Minion data cache 
Includes docs for localfs and consul minion data cache modules
 2017-01-19 15:53:22 -07:00
Mike Place
d489e05bd4 Merge pull request #38806 from isbm/isbm-systemd-service-files 
Add a salt-minion service control file
 2017-01-18 14:39:31 -07:00
Mike Place
ad667d33e8 Merge pull request #38797 from SaltyCharles/patch-5 
update gitfs.rst for clarity
 2017-01-18 08:33:18 -07:00
Bo Maryniuk
eb25e2f768 Add a salt-minion service control file 2017-01-18 15:38:53 +01:00
SaltyCharles
e127013892 update gitfs.rst for clarity 
Add note for "Unsupported URL Protocol" error when using pygit2 without libssh2.
 2017-01-17 15:44:00 -08:00
Mike Place
04bf3af6bb Merge pull request #38785 from rallytime/doc-test-fix 
Add CLI Examples for functions in the namecheap_ns execution module
 2017-01-17 11:44:20 -07:00
Mike Place
1bc6ab9f1b Merge pull request #38783 from lomeroe/adml_search_fix 
Perform a "starts-with" search to match ADML text names
 2017-01-17 11:34:38 -07:00
Nicole Thomas
6f23a946cd Merge pull request #38784 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-17 11:25:33 -07:00
rallytime
a13caacba4 Add CLI Examples for functions in the namecheap_ns execution module 2017-01-17 10:24:03 -07:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -07:00
Ethan Moore
c2301d4aff update adml text search to use 'starts-with' as some policies text has trailing spaces 2017-01-17 16:36:22 +00:00
Mike Place
89dc86e2bc Merge pull request #38667 from rallytime/bp-37982 
Back-port #37982 to 2016.11
 2017-01-17 08:42:12 -07:00
Mike Place
41cfcf2fdb Merge pull request #38763 from github-abcde/gpg-render-stringIO 
GPG renderer support for cStringIO.InputType
 2017-01-17 08:26:15 -07:00
Mike Place
751e14c523 Merge pull request #38759 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-17 08:22:00 -07:00
Mike Place
bb6291d93a Merge pull request #38778 from cloudflare/fix-38775 
Fix "Error using napalm netusers"
 2017-01-17 08:20:26 -07:00
Mike Place
bd0de2d810 Merge pull request #38764 from theredcat/develop 
Add solrcloud module and state
 2017-01-17 08:19:34 -07:00
Mike Place
766275c5f5 Merge pull request #38769 from github-abcde/pillar-file-tree-templating 
pillar/file_tree.py: Data read from files is now passed through the c…
 2017-01-17 07:57:44 -07:00
Mike Place
073ee3f422 Merge pull request #38770 from mitar/patch-2 
dockerng module: Adding unless-stopped as an option to restart policy
 2017-01-17 07:55:42 -07:00
Mircea Ulinic
b3388f7162 Fix #38775 2017-01-17 14:14:54 +00:00
Mitar
3445dc71b9 Adding unless-stopped as an option to restart policy. 2017-01-17 05:05:03 -08:00
herbert.buurman
632f8831b9 pillar/file_tree.py: Data read from files is now passed through the compile_template_str-function before being put into the pillar. Default renderer pipeline, as well as renderer blacklist and renderer whitelist can be configured from the salt master config. 2017-01-17 13:43:20 +01:00
Nathan DELHAYE
823732b614 Fix Lint 2017-01-17 11:17:55 +01:00
herbert.buurman
26f4780efb renderers/gpg.py: Pylint fixes 2017-01-17 11:13:46 +01:00
herbert.buurman
919d272bd6 renderers/gpg.py: Added check and workaround if data is of type cStringIO.InputType (which it is when handed from template.py) 2017-01-17 11:07:35 +01:00
Nathan DELHAYE
da01e08f4f Add solrcloud module 2017-01-17 11:02:27 +01:00
Mike Place
6663107021 Merge pull request #38664 from clinta/x509-passphrase2 
X509 Improvements. Expose setting permissions, encrypted private keys, and combined key and cert management in one state
 2017-01-16 19:20:17 -07:00
Mike Place
22ffe89d05 Merge pull request #38724 from alexbleotu/vsphere_module_function_depends-gh 
Vsphere module function depends gh
 2017-01-16 19:18:37 -07:00
Mike Place
8093f72e9d Merge pull request #38687 from eradman/vmware_provisioning 
Try to resolve guest IP if VMware Tools is not installed
 2017-01-16 19:17:35 -07:00
Mike Place
574261dba5 Merge pull request #38747 from eradman/dir_symlink 
Respect follow_symlinks when run with test=True
 2017-01-16 19:14:27 -07:00
Mike Place
8a1dcfa4d9 Merge pull request #38752 from dincamihai/develop 
Allow changing baseurl with pkg.mod_repo(zypper)
 2017-01-16 19:10:34 -07:00
Mike Place
5bd64e34e6 Merge pull request #38757 from skizunov/develop2 
Add support for 'nilrt-xfce' systems in grains
 2017-01-16 19:09:34 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
Nicole Thomas
8466b34e82 Merge pull request #38743 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2017-01-16 18:46:00 -07:00
Sergey Kizunov
f3ccd25c82 Add support for 'nilrt-xfce' systems in grains 
In addition to the currently supported systems that have 'nilrt'
mapped to 'os': 'NILinuxRT' and 'os_family': 'NILinuxRT', add
support for a 'nilrt-xfce' system which will map to 'os': 'NILinuxRT-XFCE'
and 'os_family': 'NILinuxRT'.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-01-16 16:43:24 -06:00
Clint Armstrong
77c78723fe pep8 2017-01-16 13:09:09 -05:00
Mihai Dinca
cfa22b4716 Allow changing baseurl with pkg.mod_repo(zypper) 2017-01-16 17:04:24 +01:00
Clint Armstrong
a2b20ee518 No mutable default args, remove unneeded import 2017-01-16 08:12:06 -05:00
Alexandru Bleotu
0c32597490 pylint fix to states/boto_secgroup 2017-01-16 11:30:52 +00:00
Alexandru Bleotu
d09a40e52a pylint fixes to vsphere_test 2017-01-16 11:28:41 +00:00
Alexandru Bleotu
e01f0bd271 Added pyvmomi dependencies to all functions in modules.vsphere that require it 2017-01-16 10:27:17 +00:00
Alexandru Bleotu
f0dc1d39f7 Added esx_cli dependencies to all functions in modules.vsphere that use it 2017-01-16 10:27:09 +00:00
Alexandru Bleotu
9b8f5b2e55 Removed PYVSAN dependency from __virtual__ function of modules.vsphere module 2017-01-16 10:25:50 +00:00
Alexandru Bleotu
e6dbf3e7eb Added module level evaluation if esxcli exists 2017-01-16 10:25:49 +00:00
Alexandru Bleotu
e9d669a59f Added depends import 2017-01-16 10:25:49 +00:00
Eric Radman
fa3648c576 Respect follow_symlinks when run with test=True 
Previously file.directory correctly sets the permissions of the target
of a symlink, but it did not return the correct result during a dry run.
This change plumbs the follow_symlinks parameter to test-only functions.
 2017-01-16 03:04:50 -05:00
Eric Radman
755c8901ec Fix pylint errors C0326 and C0303 2017-01-16 02:29:48 -05:00
Eric Radman
17fc12175c Try to resolve guest IP if VMware Tools is not installed 
In some cases installation of VMware Tools is not possible. Enable
salt-cloud to bootstrap a minion by using DNS to resolve it's IP.
 2017-01-15 22:42:53 -05:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
Mike Place
a642cdef79 Merge pull request #38723 from rallytime/fix-38674 
Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py
 2017-01-15 11:36:13 -07:00
Mike Place
bf6d74c98e Merge pull request #38682 from cloudflare/NotImplementedError-MSG 
[2016.11.2/napalm] Better error message when NotImplementedError raised
 2017-01-15 11:34:24 -07:00