valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
54,135 Commits 24 Branches 182 Tags 341 MiB
fc7f0724d3
Commit Graph

54135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnold Bechtoldt
fc7f0724d3 add missing module documentation to references 2015-06-04 21:17:24 +02:00
Joseph Hall
ca2b7320bb Merge pull request #24404 from edouardb/scaleway-provider-doc 
Add Getting Started for Scaleway provider
 2015-06-04 09:33:38 -06:00
Justin Findlay
76b54fc886 Merge pull request #24393 from dr4Ke/fix_grains.set_preserve_list_order 
Fix grains.set preserve list order
 2015-06-04 09:10:19 -06:00
Justin Findlay
a5d14ec78a Merge pull request #24392 from quixoten/use_found_cmd_path 
Fix "No such file or directory" in grains/core.py
 2015-06-04 09:08:06 -06:00
Nicole Thomas
ddc167907f Merge pull request #24335 from nmadhok/patch-cloud 
Only pop the key if the key exists otherwise do nothing
 2015-06-04 08:47:58 -06:00
Edouard Bonlieu
908b27869d Add Getting Started for Scaleway provider 2015-06-04 16:23:06 +02:00
Christophe Drevet-Droguet
c902cb7f51 module function grains.set: fix preserve list order 2015-06-04 09:57:29 +02:00
Christophe Drevet-Droguet
7b9451451f module grains tests: test list order preservation 2015-06-04 09:52:09 +02:00
Devin Christensen
b69e0cf710 Use path found by salt.utils.which 
I ran into this problem running `salt-ssh '*' test.ping` with a
XenServer 6.5 node as the target. Even though the `lspci` and
`dmidecode` (after I installed it) commands are found by
`salt.utils.which`, because they're not actually in the `$PATH`, they
fail to execute.
 2015-06-04 01:29:29 -06:00
Justin Findlay
c40e5d8d12 Merge pull request #24377 from lyft/boto-kms-docs 
Add boto_kms docs
 2015-06-03 17:03:34 -06:00
Nicole Thomas
f9f16de77e Merge pull request #23620 from lyft/boto-util-get-error-fix 
Make boto util get_error function compatible with newer boto modules
 2015-06-03 16:34:35 -06:00
Ryan Lane
a3924bba0e Add boto_kms docs 2015-06-03 15:18:52 -07:00
Colton Myers
6c84fa03a0 Merge pull request #24373 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-03 15:19:45 -06:00
Justin Findlay
1e0f247447 Merge pull request #24357 from zhujinhe/develop 
fix invoke issues of Jinja Macros example
 2015-06-03 15:06:30 -06:00
Justin Findlay
5cbebf6832 Merge pull request #24353 from cetra3/file-copy-force-fix 
Set changed = true if the file has changed when using file.copy state
 2015-06-03 14:38:54 -06:00
Colton Myers
c41d9f4ae2 Reformat lxc.py and fix a bad merge conflict resolution 2015-06-03 13:52:52 -06:00
Colton Myers
baf4337918 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/lxc.py
    salt/roster/clustershell.py
 2015-06-03 13:47:08 -06:00
Colton Myers
86a3b317c6 Merge pull request #24348 from makinacorpus/lxcpre 
Try to close input pipes before calling lxc-start
 2015-06-03 13:38:07 -06:00
Justin Findlay
d71d75e2ec Merge pull request #24372 from rallytime/release_notes 
Add 2015.5.2 release notes
 2015-06-03 13:30:45 -06:00
rallytime
f5ec1a1693 Add 2015.5.2 release notes 2015-06-03 13:27:17 -06:00
Justin Findlay
76927c9ea1 Merge pull request #24346 from rallytime/bp-24271 
Backport #24271 to 2015.5
 2015-06-03 12:44:31 -06:00
Justin Findlay
4afa03d8e3 Merge pull request #24345 from rallytime/bp-24013 
Backport #24013 to 2015.5
 2015-06-03 12:39:41 -06:00
Mathieu Le Marec - Pasquet
0cb11a2767 lxc: typo 2015-06-03 20:18:56 +02:00
Ryan Lane
4699756c2b Lint fix 2015-06-03 10:52:22 -07:00
Thomas S Hatch
c3392c246a Merge pull request #24365 from jacobhammons/DocFixes 
Fixes for PDF build errors
 2015-06-03 11:50:02 -06:00
Colton Myers
d710489794 Merge pull request #24347 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-03 09:38:49 -06:00
Jacob Hammons
0fc190267f Fixes for PDF build errors 2015-06-03 09:18:20 -06:00
Thomas S Hatch
6ad40132ae Merge pull request #23915 from terminalmage/issue7772 
pkg.installed: Check binary pkg metadata to determine action
 2015-06-03 08:50:40 -06:00
Thomas S Hatch
12f3b164de Merge pull request #24315 from twangboy/fix_x509 
Fixed stacktrace when looking for M2Crypto
 2015-06-03 08:49:30 -06:00
Thomas S Hatch
ae681a4db1 Merge pull request #24313 from nicholascapo/fix-22991-npm.installed-test-true 
Fix #22991 Correctly set result when test=True
 2015-06-03 08:49:18 -06:00
Thomas S Hatch
d57a9a267c Merge pull request #24312 from nicholascapo/fix-18966-file.serialize-test-true 
Fix #18966: file.serialize supports test=True
 2015-06-03 08:49:06 -06:00
zhujinhe
15cdd58968 fix invoke issues of Jinja Macros example 
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
 2015-06-03 12:16:29 +08:00
Thomas S Hatch
636288c3b6 Merge pull request #24332 from jacksontj/develop 
Add party controls to zk_concurrency
 2015-06-02 21:29:28 -06:00
Thomas S Hatch
6b694e3495 Merge pull request #24302 from jfindlay/pkg_tests 
fix pkg hold/unhold integration test
 2015-06-02 21:27:43 -06:00
Thomas S Hatch
38714ac2b0 Merge pull request #24321 from dr4Ke/feature_grains.set 
Feature grains.set
 2015-06-02 21:27:24 -06:00
Joseph Hall
aca8447ced Merge pull request #24349 from rallytime/fix-14021 
Remove references to mount_points in ec2 docs
 2015-06-02 19:54:09 -06:00
Thomas Jackson
2c6a5c7d1e Add comment attempting to explain the security shortcomings of salt-cp 
salt-cp definitely has its uses, but I want to call out the fact that it isn't designed as a secure file transfer mechanism.
 2015-06-02 18:26:04 -07:00
Thomas Jackson
e7e01fadbf Add name kwarg to STATE_RUNTIME_KEYWORDS 
The state system packs in `name` (the highstate's name) to each state module as an optional kwarg. Since this wasn't called out as a RUNTIME keyword you would get warnings (in the states) that look something like:

```
    Warnings: 'name' is an invalid keyword argument for
              'SOMETHING_HERE'. 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.
```

Since `name` is an internal thing, we'll mark it as such-- meaning you won't get warnings if you don't use it.
 2015-06-02 18:26:03 -07:00
Thomas Jackson
651f215e2a Add party controls to zk_concurrency 
In addition to simple locking, sometimes you want to check that there are sufficient hosts working (in the party) before doing your state change.
 2015-06-02 18:26:03 -07:00
cetra3
0ff4366e91 Set changed = true if the file has changed when using file.copy state and force 2015-06-03 10:00:21 +09:30
Nicholas Capo
ac9644cb19 Fix #22991 npm.installed correctly set result on test=True 2015-06-02 18:09:19 -05:00
rallytime
a235b114d7 Remove references to mount_points in ec2 docs 
Fixes #14021
 2015-06-02 16:32:26 -06:00
Ryan Lane
055fa8b1d4 Greater compatibility for modules in get_error in boto utils 2015-06-02 15:21:43 -07:00
Ryan Lane
c810ad0344 Make boto util get_error function compatible with newer boto modules 2015-06-02 15:21:43 -07:00
Mathieu Le Marec - Pasquet
d71efa6d66 Try to close input pipes before calling lxc-start 
This should fix #24284
This refs lxc/lxc#548

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-02 23:59:25 +02:00
Colton Myers
288d49e51c Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/ipmi.py
 2015-06-02 15:51:50 -06:00
Randy Bias
04067b6833 Fixed the setup instructions 
Fixed the instructions in the code to match the website (http://docs.saltstack.com/en/latest/topics/cloud/gce.html).
 2015-06-02 15:44:18 -06:00
Jean-Baptiste Quenot
16e0732b50 Fix enabling a service on Ubuntu #24012 
This reverts commit bd6f5ea370.
 2015-06-02 15:42:25 -06:00
Nicholas Capo
e7328e7043 Fix #18966 file.serialize correctly set result on test=True 
* Use file.check_managed_changes to diff the file when test=True
 2015-06-02 15:50:28 -05:00
Thomas S Hatch
31f49947b9 Merge pull request #24026 from jpic/fix/lxc_network_profile 
Document DHCP usage on LXC < 1.0.7
 2015-06-02 14:41:19 -06:00