Jarrod Moore
da5fac2b36
Back-port #28740 to 2014.7
2015-11-11 10:09:37 -07:00
Jarrod Moore
49256b7d90
Back-port #28740 to 2015.5
2015-11-11 10:07:06 -07:00
Steve Valaitis
5d8792ed10
cleanup unneeded imports
2015-11-11 11:03:56 -06:00
Jarrod Moore
8a2780da18
Add missing S3 module import
...
In the get_url method, a salt.utils.s3.query method call is made, but this won't work unless the salt.utils.s3 module is imported. This missing line breaks file.managed resources where source and source_hash attributes use s3:// URLs.
2015-11-11 10:03:20 -07:00
Quan Tong Anh
c3420461c3
boto_vpc: return an empty dict in case cannot get the route tables
2015-11-11 10:01:16 -07:00
rallytime
07482211eb
rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list.
...
Refs #28269
2015-11-11 09:45:35 -07:00
Mike Place
6e2003e885
Merge pull request #28630 from messa/201511-messa-s3-fixes
...
Use S3 credentials from Pillar
2015-11-11 09:44:40 -07:00
Mike Place
c52f85ea7e
Lint fix
2015-11-11 09:41:49 -07:00
Scott Walton
e9b84b35b4
Resolved merge conflict with upstream.
2015-11-11 16:38:31 +00:00
Scott Walton
eb6577eb49
Use list comps #28608
2015-11-11 16:35:06 +00:00
Scott Walton
e46d31d446
Amended the tests to remove the tab-check and still keep #28608 fixed
2015-11-11 16:32:56 +00:00
Mike Place
0d912bf0d4
Merge pull request #28744 from jfindlay/elementttree
...
import gate elementtree
2015-11-11 09:29:12 -07:00
Jorge Schrauwen
b58793cb72
even more context for log message when available
2015-11-11 16:22:38 +00:00
Mike Place
b65e786351
Merge pull request #28758 from jfindlay/user
...
remove redundant logic in useradd execution module
2015-11-11 09:22:21 -07:00
Jorge Schrauwen
e82d819f03
drop outer parens, not needed
2015-11-11 16:11:26 +00:00
Justin Findlay
6eced26013
Merge pull request #28757 from mbarrien/fix-pip-cmd
...
Bug fix: pip command to not quote spaces in cmd line args
2015-11-11 09:08:45 -07:00
Mark Rosedale
1c1a4b4410
Update puppet.py
...
Fix pylint errors.
2015-11-11 11:07:05 -05:00
Mike Place
356bf2987d
Merge pull request #28764 from multani/fix/docs
...
Various documentation fixes
2015-11-11 09:06:09 -07:00
Jorge Schrauwen
25d120e656
add indication where the log messages come from
2015-11-11 15:59:33 +00:00
Jorge Schrauwen
dbf472cad0
switch to salt.utils.fopen for _read_config and _write_config
2015-11-11 15:53:36 +00:00
Mike Place
eba0028639
Merge pull request #28734 from sjorge/module-vmadm-tweaks
...
handle kwargs + variables better
2015-11-11 08:38:14 -07:00
Seth House
77d4b980f1
Merge pull request #28760 from dmyerscough/28732-Fix-cherrypi-api-keys-endpoint
...
Fixing CherryPy key bug
2015-11-11 08:11:18 -07:00
mrosedale
59bd6aef5c
Merge pull request #1 from mrosedale/mrosedale-patch-1
...
Update puppet.py
2015-11-11 09:49:02 -05:00
mrosedale
c26ea916aa
Update puppet.py
...
Update that fixes #28692 where puppet.noop results in an empty puppet run or when providing arguments to puppet.run without setting agent as the first argument results in an empty puppet run.
2015-11-11 09:47:01 -05:00
Jorge Schrauwen
21dce2daea
add main docs section
2015-11-11 11:48:42 +00:00
Jorge Schrauwen
7b137148e4
implement smartos.vm_absent and smartos.vm_present
2015-11-11 11:17:18 +00:00
Jonathan Ballet
1a31b69763
doc: fix documentation formatting in salt.utils.jinja
2015-11-11 12:01:10 +01:00
Jonathan Ballet
59c105b4b9
doc: fix documentation formatting in salt.states.boto_iam*
2015-11-11 12:00:59 +01:00
Jonathan Ballet
cbb167c8ee
doc: fix documentation formatting in in salt.modules.lxc
2015-11-11 12:00:17 +01:00
Jonathan Ballet
cb03a89e52
doc: fix documentation formatting in salt.modules.aptpkg
2015-11-11 12:00:08 +01:00
Jorge Schrauwen
a0b171f64c
implement smartos.vm_stopped and smartos.vm_started
2015-11-11 10:50:08 +00:00
Jorge Schrauwen
73e9aec250
implement smartos.image_present, smartos.image_absent, and smartos.image_vacuum
2015-11-11 10:35:53 +00:00
Jorge Schrauwen
edb382cda8
implement smartos.config_present and smartos.config_absent
2015-11-11 10:21:22 +00:00
akandavelu
37aed37a23
fix pylint for mysql module and mysql_database state
2015-11-11 14:32:03 +05:30
Damian Myerscough
206d1684b2
Fixing CherryPy key bug
2015-11-10 22:20:59 -08:00
Justin Findlay
987d1fee7c
simplify stdin use of stdin in at.present state
...
Corollary to #28187 .
2015-11-10 22:43:51 -07:00
Justin Findlay
dbd582cd8d
fix doc formatting in user.present state
2015-11-10 21:57:08 -07:00
Justin Findlay
3824d2e9fc
only change/report new home when createhome is True
2015-11-10 21:56:34 -07:00
Justin Findlay
3fbf81611f
remove redundant logic in useradd execution module
...
Fixes #28726 .
2015-11-10 21:55:08 -07:00
Justin Findlay
d77c24e70d
Merge pull request #28752 from aboe76/suse_tumbleweed_grain
...
Update openSUSE grain for tumbleweed
2015-11-10 20:54:37 -07:00
Justin Findlay
7c5811ddf0
Merge pull request #28725 from quantonganh/boto-describe-route-table
...
boto_vpc: return an empty dict in case cannot get the route tables
2015-11-10 20:16:35 -07:00
Justin Findlay
a620bc5596
Merge pull request #28713 from hexedpackets/fix-consul-module
...
Rename consul.list to consul.list_keys.
2015-11-10 17:57:23 -07:00
Michael Barrientos
6df6cb82a6
Fix pip command to not quote spaces in cmd line args
2015-11-10 16:34:18 -08:00
Metin Osman
e31e22d96a
Fix 25775
...
Loop lsblk cmd exec until ok or 30s max
2015-11-11 01:33:25 +01:00
Justin Findlay
e321d60002
import gate elementtree in artifactory module
2015-11-10 17:25:18 -07:00
Justin Findlay
f20f3f697b
import gate elementtree in boto_iam state
2015-11-10 17:25:18 -07:00
Justin Findlay
9845d2f2c6
import gate elementtree in boto_cfn state
...
Fixes #28655 .
2015-11-10 17:25:18 -07:00
rallytime
5abe010023
Move most vmware driver list_* functions to use salt.utils.vmware functions
2015-11-10 16:23:27 -07:00
Andy Grunwald
371fc8f004
Renamed function to avoid conflicts with the native python list() function
2015-11-10 20:34:37 +01:00
Andy Grunwald
aef6322d74
Changed globals() call with __salt__ variable
2015-11-10 20:31:00 +01:00
