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
54,063 Commits 24 Branches 182 Tags 341 MiB
e7e01fadbf
Commit Graph

54063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
David Boucha
f9955095b3 Merge pull request #24333 from corywright/fix-netapi-cherrypi-docs 
Fix formatting of example curl command in netapi.rest_cherrypy docs
 2015-06-02 09:00:21 -06:00
Cory Wright
084c636fad Fix formatting of example curl command in netapi.rest_cherrypy docs 2015-06-02 10:55:00 -04:00
Joseph Hall
a273a9afd2 Merge pull request #24324 from nmadhok/vmware-cloud-driver 
Sometimes VMware tools status is unavailable so make sure not to fail with KeyError
 2015-06-02 08:15:58 -06:00
Joseph Hall
c71c01f18b Merge pull request #24325 from nmadhok/patch-warning 
Making sure there is a new line after the Deprecation Warnings under salt-cloud
 2015-06-02 08:15:15 -06:00
Nitin Madhok
9a9268f424 Making sure there is a new line after the Deprecation Warnings 2015-06-02 06:49:58 -04:00
Nitin Madhok
fcb6d2246b Sometimes VMware tools status is unavailable so make sure not to throw a KeyError 2015-06-02 05:32:51 -04:00
Nicole Thomas
c07af6205d Merge pull request #24307 from techhat/ec2pricestd 
Standardize return values in EC2 pricing
 2015-06-01 15:30:33 -06:00
Colton Myers
6d385280dc Merge pull request #24300 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-01 15:21:40 -06:00
Thomas S Hatch
dee3589edb Merge pull request #24306 from techhat/softlayerprice 
Allow Softlayer HW driver to display pricing information
 2015-06-01 14:40:42 -06:00
Joseph Hall
90efbbf0ba Make sure profile name is in return 2015-06-01 13:44:59 -06:00
Joseph Hall
5fd7b324b8 Standardize return values in EC2 pricing 2015-06-01 13:43:05 -06:00
Joseph Hall
d72832077f Fix EC2 refs 2015-06-01 13:39:55 -06:00
Colton Myers
e9b3bbb588 Merge pull request #23982 from makinacorpus/lxc_path 
lxc: path support
 2015-06-01 13:38:52 -06:00
Joseph Hall
62b982b808 Allow Softlayer HW driver to display pricing information 2015-06-01 13:31:24 -06:00
Colton Myers
f5c19fac7b Remove unused import 2015-06-01 13:29:05 -06:00
Mathieu Le Marec - Pasquet
f50e6dafa8 lxc: path support 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-01 20:22:57 +02:00
Thomas S Hatch
438a024e68 Merge pull request #24293 from edouardb/scaleway-provider 
Added Scaleway cloud provider
 2015-06-01 11:47:24 -06:00
Thomas S Hatch
5eae6de609 Merge pull request #24282 from The-Loeki/better-ipv6 
Final part of #22080
 2015-06-01 11:46:15 -06:00
Thomas S Hatch
ac1134af22 Merge pull request #24188 from aneeshusa/add-sqlite-pillar 
Add sqlite3 pillar
 2015-06-01 11:45:15 -06:00
Colton Myers
a6a868be6b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/iptables.py
    salt/utils/dictupdate.py
 2015-06-01 10:29:32 -06:00
Edouard Bonlieu
b85deb3092 Fix Python 3 compatibility 2015-06-01 16:26:52 +02:00
Nicole Thomas
73cd2cbe1f Merge pull request #24287 from jfindlay/pkg_test 
fix pkg test on ubuntu 12.04 for realz
 2015-06-01 08:16:37 -06:00
Edouard Bonlieu
84d95aee13 Rework array building in list_nodes_full for python2.6 compatibility 2015-06-01 14:59:24 +02:00
Edouard Bonlieu
f31260609c Remove unused import 2015-06-01 14:56:09 +02:00
Edouard Bonlieu
dcebb38627 /"/' 2015-06-01 09:57:21 +02:00
Justin Findlay
02017a074c Merge pull request #24279 from rallytime/bp-24263 
Backport #24263 to 2015.5
 2015-05-31 22:29:34 -06:00
Justin Findlay
9514964075 Merge pull request #24278 from rallytime/boto_delete_policies_doc 
Add arg documentation for delete_policies
 2015-05-31 22:28:49 -06:00
Justin Findlay
2ba696d54a Merge pull request #24277 from rallytime/fix_iptables_jump 
Put a space between after_jump commands
 2015-05-31 22:28:26 -06:00
Justin Findlay
40da36b950 Merge pull request #24270 from jodv/sync_log_handlers 
Add log_handlers syncing to saltutil module
 2015-05-31 22:27:30 -06:00
Justin Findlay
4e48d3e222 Merge pull request #24285 from davidjb/patch-2 
Document availability of arguments to file states
 2015-05-31 22:26:32 -06:00
Justin Findlay
98944d8c7f fix pkg test on ubuntu 12.04 for realz 2015-05-31 22:23:17 -06:00
David Beitey
c2bc1f8303 Document availability of arguments to file states 
Mention in the documentation that all arguments to a Python-rendered templated file will be made available as globals to the Python script.
 2015-06-01 11:29:57 +10:00
rallytime
e2d1606b19 Move after_jump split out of loop 2015-05-31 17:25:08 -06:00
Ronald van Zantvoort
2a2210b437 Fix subnets 2015-05-31 23:56:28 +02:00
Ronald van Zantvoort
d1e9e5434f Revert addition of oddly behaving tests 2015-05-31 23:31:49 +02:00
Ronald van Zantvoort
9682388d61 Pylint fixes 2015-05-31 22:51:15 +02:00
Ronald van Zantvoort
35a591903a * PyLint fixes 
* Make _subnets() IP agnostic
* Add subnets6
* Fix CkMinions with the same <ugh> ipcidr matcher code
 2015-05-31 22:21:08 +02:00
Ronald van Zantvoort
15e85184dc Move loading of ipaddress module where it belongs 2015-05-31 22:18:15 +02:00
rallytime
d14f1307b6 Remove extra loop 2015-05-31 13:17:06 -06:00
Ronald van Zantvoort
65096c407b Stoopid typos 2015-05-31 21:03:40 +02:00
Ronald van Zantvoort
07af81e817 Try adding a few extra unit tests 
First drop of final fix for #22080
 2015-05-31 20:52:30 +02:00
Ronald van Zantvoort
f36a3d9403 Improve calculate_subnet further, rename to calc_net 2015-05-31 19:12:16 +02:00
Jeremy Rosenbaum
486e140da7 add "versionadded" to sync_log_handlers docstring 2015-05-31 09:59:57 -07:00
Ronald van Zantvoort
d69659e179 Deprecate utils.ip_in_subnet 2015-05-31 18:45:14 +02:00
Ronald van Zantvoort
91b7258643 get_net_start IP agnostic 2015-05-31 18:44:46 +02:00
Ronald van Zantvoort
f14b462155 Refactor ip_addr functions to utilize ipaddress library & become properly loopback aware 2015-05-31 17:50:39 +02:00
Nicole Thomas
7ee303abd9 Merge pull request #24271 from randybias/patch-1 
Fixed the setup instructions
 2015-05-31 09:46:54 -06:00