Samuel M Smith
a177bf8f47
fixed unittests missing close of roadstack caused error on other tests
2015-10-23 10:19:49 -06:00
Mike Place
570e7faa3b
Merge pull request #28231 from rallytime/fix-28227
...
Make sure we're compairing strings when getting images in the DO driver
2015-10-23 07:49:37 -06:00
Mike Place
1c55513ce3
Merge pull request #28224 from techhat/spmoptimize
...
Optimize create_repo for large packages
2015-10-23 07:40:06 -06:00
Mike Place
f269f40905
Merge pull request #28214 from rallytime/fix_boto_route53_stacktrace
...
Don't stacktrace if invalid credentials are passed to boto_route53 state
2015-10-23 07:37:30 -06:00
Mike Place
0775d159f8
Merge pull request #28228 from rallytime/bp-27562
...
Back-port #27562 to 2015.8
2015-10-23 07:34:41 -06:00
Mike Place
af241dc054
Merge pull request #28232 from rallytime/fix-28230
...
Add documentation to supply the ssh_username: freebsd config to DO docs
2015-10-23 07:31:52 -06:00
rallytime
8b06ab4335
Add documentation to supply the ssh_username: freebsd config to DO docs
...
Fixes #28230
2015-10-22 15:24:39 -06:00
rallytime
0985780f12
Make sure we're compairing strings when getting images in the DO driver
...
For example, FreeBSD's "name" from DO is 10.2. This gets converted to
a float from the cloud config (if it's not wrapped in quotes). Later,
we look for this value in data from DO, which are strings.
Fixes #28227
2015-10-22 14:56:31 -06:00
Joseph Hall
847809541e
Updates as per @s0undt3ch
2015-10-22 14:02:11 -06:00
Joseph Hall
cf5fefdf5f
Add dependency resolution to SPM
2015-10-22 14:02:11 -06:00
Joseph Hall
faeef55d2f
Optimize create_repo for large packages
2015-10-22 13:18:57 -06:00
rallytime
cdeb8caabe
Pylint Fix
2015-10-22 12:43:56 -06:00
rallytime
11c475b0ad
Don't stacktrace if invalid credentials are passed to boto_route53 state
2015-10-22 11:22:41 -06:00
Erik Johnson
b80da6e23a
Fix for ext_pillar being compiled twice in legacy git_pillar code
2015-10-22 11:03:43 -05:00
jacobhammons
36dc12c62c
Merge pull request #28198 from jacobhammons/docs
...
Added note regarding missing spm exe on Debian/Ubuntu
2015-10-21 22:40:18 -06:00
Jacob Hammons
cfadda0c0c
Added note regarding missing spm exe on Debian/Ubuntu
...
Minor fixes to spm docs
2015-10-21 22:34:45 -06:00
Stuart Jansen
52c915e29d
fix at.present
...
Because cmd contains a pipe, it must be run by a real shell.
2015-10-21 16:02:18 -06:00
Joseph Hall
fbad88fb99
Merge pull request #28182 from erchn/fix_nova_rackspace
...
Some fixes for nova driver for Rackspace
2015-10-21 15:26:18 -06:00
Mike Place
a1a924f170
Merge pull request #28181 from rallytime/fix-27454
...
Revamp firewalld state to be more stateful.
2015-10-21 15:19:18 -06:00
justinta89
5cdb15c9e3
Added single package return for latest_version, fixed other bug.
2015-10-21 15:11:40 -06:00
Mike Place
d93ad103c7
Merge pull request #28176 from cro/ssh_no_ping
...
Add ping function
2015-10-21 14:49:54 -06:00
Ethan Erchinger
7b54f04ba2
wrap server_list[_detailed] in try/except block for TypeError
...
this catches servers that are actively being deleted, or otherwise have missing data structures
2015-10-21 20:15:32 +00:00
Ethan Erchinger
b7f8487615
rackconnectv3 default to False, not 'False'
...
get private_ips in rackconnectv2 environment and populate data object
get public_ips and put in data object before returning "result" structure
2015-10-21 20:12:54 +00:00
rallytime
3e13880af8
Make sure we catch all potential exceptions
2015-10-21 14:10:41 -06:00
rallytime
cb4efa87e8
Make sure state returns False when execution module calls fail
2015-10-21 13:59:26 -06:00
C. R. Oldham
3e05437f15
Add ping function
2015-10-21 13:04:27 -06:00
rallytime
232b2825e4
Revamp firewalld state to be more stateful.
2015-10-21 12:44:09 -06:00
Mike Place
8e08f39381
Merge pull request #28167 from The-Loeki/patch-1
...
file.serialize needs to add a final newline to serialized files
2015-10-21 11:12:33 -06:00
Ronald van Zantvoort
46bf6d4fa3
Update file.serialize test for Python serialized
...
pprint.pformat seems non-reversible, so just add the newline there as well
2015-10-21 17:12:53 +02:00
Mike Place
559a517ad6
Merge pull request #28168 from rallytime/fix-27855
...
Make sure availability zone gets passed in boto_vpc module when creating subnet
2015-10-21 08:48:02 -06:00
rallytime
50fb77dc50
Make sure availability zone gets passed in boto_vpc module when creating subnet
...
Fixes #27855
2015-10-21 07:39:13 -06:00
Mike Place
dcd90363fe
Merge pull request #28148 from basepi/fix.nodegroup.backwards.compat.24660
...
[2015.8] Only expand nodegroups to lists if there is a nested nodegroup
2015-10-21 07:20:06 -06:00
Ronald van Zantvoort
66831fd087
file.serialize needs to add a final newline to serialized files
...
It's only proper and nice to do.
It shouldn't have any impact other than `cat` playing nice ;)
2015-10-21 14:53:23 +02:00
Colton Myers
053ad408c7
Merge pull request #28155 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-10-20 17:48:41 -06:00
Colton Myers
c4c889f97b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
salt/daemons/masterapi.py
salt/minion.py
2015-10-20 14:47:49 -06:00
Colton Myers
11d6a2b6ac
Add some docs
2015-10-20 14:42:08 -06:00
Colton Myers
036d767a98
Keep track of recursive nodegroup_comp calls, keep list format if it's recursing
2015-10-20 14:39:32 -06:00
Nicole Thomas
53dd01fc24
Merge pull request #28149 from pass-by-value/proxmox_profile_doc_change
...
Add clarification to cloud profile doc about host
2015-10-20 13:46:05 -06:00
Colton Myers
155634a0aa
Finish thought
2015-10-20 13:40:23 -06:00
Aditya Kulkarni
bc371c55cd
Add clarification to cloud profile doc about host
2015-10-20 15:17:47 -04:00
Colton Myers
528b16756b
Only expand nodegroups to lists if there is a nested nodegroup
2015-10-20 13:13:24 -06:00
Mike Place
7badd634ae
Merge pull request #28146 from cachedout/lint_dracr
...
Lint dracr.py
2015-10-20 11:55:07 -06:00
Mike Place
8b057f39e8
Lint dracr.py
2015-10-20 11:54:29 -06:00
Mike Place
5f99bd4dc6
Merge pull request #28141 from rallytime/fix-28118
...
Don't use RAM for root disk size in linode.py
2015-10-20 11:32:29 -06:00
Mike Place
7cd0440c33
Merge pull request #28143 from jtand/lint_fix
...
Removed blank line at end of chassis.py
2015-10-20 10:39:35 -06:00
justinta89
427df95515
removed extraneous file
2015-10-20 10:38:41 -06:00
Mike Place
ab18dcf637
Merge pull request #28140 from rallytime/bsd-installation-doc
...
Add OpenBSD installation documentation to 2015.5 branch
2015-10-20 10:31:34 -06:00
justinta89
1a58283f23
Removed blank line at end of chassis.py
2015-10-20 10:31:31 -06:00
Mike Place
fad38eb3c3
Merge pull request #28138 from rallytime/bp-28130-sizes-only
...
Back-port #28130 EC2 Sizes Only portion to 2015.5
2015-10-20 10:29:09 -06:00
Mike Place
858875e9fd
Merge pull request #28021 from blueyed/recursive-include
...
Handle includes in `include_config` recursively
2015-10-20 10:19:37 -06:00
