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,278 Commits 24 Branches 182 Tags 341 MiB
c2301d4aff
Commit Graph

77278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Mihai Dinca
cfa22b4716 Allow changing baseurl with pkg.mod_repo(zypper) 2017-01-16 17:04:24 +01: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
Mike Place
909bb15873 Merge pull request #38673 from kyrias/por_doc 
ref/configuration/master: Document ping_on_rotate
 2017-01-15 11:01:18 -07:00
Mike Place
a1d8023f3a Merge pull request #38675 from chenttuuvv/newfeature 
[virt] setvcpus/setmem: fix return value parsing issue when calling vm_state(vm_)
 2017-01-15 10:59:31 -07:00
Mike Place
750187c9c7 Merge pull request #38690 from lomeroe/win_lgpo_state_singlepolicyfix 
correct checking of policy_class to compare with lower() version of t…
 2017-01-15 10:58:43 -07:00
Mike Place
ffae20ee58 Merge pull request #38686 from cloudflare/STATUSPAGE-STATE 
New state: statuspage
 2017-01-15 07:51:35 -07:00
Mike Place
6d0374f3a5 Merge pull request #38714 from twellspring/patch-1 
Documentation updates for boto_secgroup
 2017-01-15 07:42:40 -07:00
Mike Place
4ff39b436f Merge pull request #38708 from giannello/patch-1 
BUGFIX: return NoneType instead of set
 2017-01-15 07:39:15 -07:00
Mike Place
dca7591a52 Merge pull request #38734 from rallytime/valid-docs-fix 
Add docs and CLI examples for new modules
 2017-01-15 07:38:45 -07:00
Mike Place
9793d310e0 Merge pull request #38725 from mostafahussein/jenkinsdocs-patch-1 
adding python-jenkins as dependecy in docs
 2017-01-15 07:36:55 -07:00
Mike Place
dd75b2e665 Merge pull request #38715 from cebe/docs-lxc-templates 
added docs about LXC container templates
 2017-01-15 07:36:18 -07:00
Mike Place
67383b01e1 Merge pull request #38717 from rallytime/py3-test-fixes 
A couple of Python 3 compatibility fixes
 2017-01-14 22:44:28 -07:00
Mike Place
9bb652a541 Merge pull request #38722 from alexbleotu/vmware_states_helper_functions-gh 
Vmware states helper functions gh
 2017-01-14 21:21:41 -07:00
rallytime
108aed047d Add more CLI Example docs for 2 execution modules: 
- namecheap_domains_dns
- selinux
 2017-01-14 12:01:53 -07:00
Nicole Thomas
049c53c07f Merge pull request #38732 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-14 11:47:26 -07:00
rallytime
df1cf551ad Add docs and CLI examples for new modules 
Affected Modules:
- boto_efs
- namecheap_users
- namecheap_domains
- namecheap_ssl
 2017-01-13 16:53:03 -07:00
Nicole Thomas
7bad2c4c2c [develop] Lint fix for gce.py (#38728) 2017-01-13 15:57:09 -07:00
rallytime
2862f70686 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
 2017-01-13 15:23:10 -07:00
Zac Brachmanis
7ca256ccee Minor spelling correction (#38721) 2017-01-13 14:57:20 -07:00
(╯°□°）╯︵ uᴉǝssnH ɐɟɐʇsoW
2ea84291e1 adding python-jenkins as dependecy in docs 
I cam through this [SOF question](http://stackoverflow.com/questions/41586859/issue-in-creating-jenkins-job-in-saltstack) which I think python-jenkins is not a library that would be installed by default
 2017-01-13 19:30:46 +02:00
Alexandru Bleotu
27aec059e6 Added tests for modules.vsphere.disconnect 2017-01-13 12:10:21 +00:00
Alexandru Bleotu
14d65d997d Added modules.vsphere.disconnect 
- retrieves a service instance to the endpoint defined by the proxy
[NOTE] Should be used in state modules, not invoked directly
 2017-01-13 12:10:21 +00:00
Alexandru Bleotu
4b11697d40 Added tests for modules.vsphere.get_service_instance_via_proxy 2017-01-13 12:10:20 +00:00
Alexandru Bleotu
1981ac1618 Added modules.vsphere.get_service_instance_via_proxy 
- retrieves a service instance to the endpoint defined by the proxy
[NOTE] Should be used in state modules, not invoked directly
 2017-01-13 12:10:20 +00:00
rallytime
6a14ddeaef [vsphere_test.py] Exception.message has been removed in Python 3 
Access the message from the Exception('exception message',) object.
 2017-01-12 15:21:56 -07:00
rallytime
29fec06671 [module_test.py] Don't rely on list ordering: assert items are in 
comment
 2017-01-12 14:19:31 -07:00
Carsten Brandt
8e977e461a
added docs about LXC container templates 
In current docs it is not clear which templates are available and also
which options these have. Added references to the docs that help the
user find the list of templates as well as the options.

My local sphinx version is too old so I could not test the HTML output,
please verify syntax is correct.
 2017-01-12 22:04:44 +01:00
Todd Wells
e8247f35a0 Documentation updates for boto_secgroup 
Documentation updates for #38709 and #28942
 2017-01-12 12:03:29 -08:00
Giuseppe Iannello
2f0d56d1df BUGFIX: return NoneType instead of set 
The add() method works on the existing set, doesn't return a new one.
 2017-01-12 16:28:50 +01:00
Ethan Moore
9e2632f631 correct checking of policy_class to compare with lower() version of the specified string 2017-01-11 15:27:07 +00:00