Commit Graph

55892 Commits

Author SHA1 Message Date
Erik Johnson
86d4fe2aa6 Use new GitPillar class for git_pillar 2015-07-21 16:46:06 -05:00
Erik Johnson
f61e7c147c Add new config options for git_pillar 2015-07-21 16:37:46 -05:00
Erik Johnson
f1aec948dc Move gitfs code to classes, add git_pillar support 2015-07-21 16:37:16 -05:00
Mike Place
9ffefc867e Merge pull request #25584 from rallytime/bp-24054-and-25576
Back-port #24054 and #25576 to 2015.5
2015-07-21 15:16:37 -06:00
Mike Place
a966e439d1 Merge pull request #25589 from jahamn/Fix-ssh_known_host-not-taking-port-into-account
Fixes ssh_known_host not taking port into account
2015-07-21 15:15:06 -06:00
Gareth J. Greenaway
c5b94e970a Switching default in 2015.8 for whether job data in returned to the mater job_cache. 2015-07-21 13:40:45 -07:00
Gareth J. Greenaway
19ca0c0b40 Switching default in 2015.5 for whether job data in returned to the mater job_cache. 2015-07-21 13:34:31 -07:00
Jason Hamner
8db7ada82d Fixed pylint e8303 errors 2015-07-21 14:03:21 -06:00
Jason Hamner
6abad29f66 Fixed pylint errors 2015-07-21 13:48:17 -06:00
Colton Myers
12b8fd05d0 Merge pull request #25588 from basepi/salt.ssh.retcode.25401
Fix some of the retcode work from #23105
2015-07-21 13:22:33 -06:00
Jason Hamner
8ae6ba1290 Merge branch '2015.5' of https://github.com/saltstack/salt into Fix-ssh_known_host-not-taking-port-into-account 2015-07-21 12:44:32 -06:00
Jason Hamner
c7466e7894 Fixes ssh_known_host to take port into account
Fixes #23626

Also adds port support for get_known_host, check_known_host, and
rm_known_host
2015-07-21 12:43:58 -06:00
Justin Findlay
df74f2c3ad Merge pull request #25573 from EvaSDK/2015.5.3-lxc-fixes
Do not execute bootstrap script twice
2015-07-21 12:20:03 -06:00
Mike Place
02d70fc218 Fix prereq in salt.state 2015-07-21 12:03:01 -06:00
Colton Myers
adbdfa9821 Don't use the opts_pkg retcode for all wfuncs
Basically, we were taking the retcode from opts_pkg calls and then
returning it as the retcode for the wfunc call. This is misleading as
opts_pkg is usually successful. I also think it was the only piece of
code utilizing the line I removed in 439a2799ce
2015-07-21 11:42:57 -06:00
Thomas S Hatch
bb6974a9aa Merge pull request #25583 from jtand/softlayer_lint
Fixed lint error where pprint wasn't imported.
2015-07-21 11:36:36 -06:00
Colton Myers
439a2799ce Remove retcode from code where it (probably) doesn't matter
The FunctionWrapper class is primarily used for cross-calling modules
from wfuncs and templating. Inserting the retcode there is probably not
helpful (it likely won't bubble through, because most calling contexts
won't look for it), and plus, we're assuming the return type is a dict
here, which is often not the case. I think this line was added
erroneously.

@ngrennan-inflection Could you look at this please? Curious about your
thoughts, and whether you tested that this specific line was actually
helping your new retcode-handling code.
2015-07-21 11:27:04 -06:00
Colton Myers
ef936c7520 Handle hosts which don't return a dict
The `ret` datastructure sometimes looked like this:

{'basepi02': "Target 'basepi02' did not return any data, probably due to an error."}

Return information is not a dict, handle that case, assume it's an error
2015-07-21 11:17:53 -06:00
Thomas S Hatch
ff2a817c9c Merge pull request #25572 from rallytime/bp-25570
Back-port #25570 to 2015.8
2015-07-21 11:06:40 -06:00
Thomas S Hatch
760955c93d Merge pull request #25575 from rallytime/scaleway_fix
Make Sure Scaleway driver works with deprecation paths
2015-07-21 11:06:19 -06:00
Peter Norton
aa9598e3a5 s3fs breaks when fetching files from s3
Per https://github.com/saltstack/salt/issues/23567 there is an exception
when trying to parse headers.  The values in the returned ret['headers']
now defaults to just being a list of strings containing the keys, but no
values are included.  It seems that in the past a list of strings of
key:value pairs was returned.

This patch requests full_headers, which instead returns a dictionary of
header keys and values.  The keys are lowercased, but otherwise they
seem to be the same.

So this patch requests the full_headers and deals with lowercasing the
desired headers.  This works for me as long as both
8999148da0
and
80c7a697ae
are applied.
2015-07-21 10:31:08 -06:00
Matthew Williams
1667d67c3e s3.head: return useful data 2015-07-21 10:30:33 -06:00
justinta89
fb27f5dd86 Removed pprint all together 2015-07-21 10:29:32 -06:00
Colton Myers
cf317b461e Merge pull request #25564 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-07-21 09:43:54 -06:00
Colton Myers
0592c4aa0c Remove _prepare assignments 2015-07-21 09:43:16 -06:00
justinta89
82549271e6 Fixed lint error where pprint wasn't imported. 2015-07-21 09:42:56 -06:00
Mike Place
79a809dd79 Merge pull request #25580 from attiasr/patch-1
use explicit utf-8 decoding (#25532)
2015-07-21 09:40:49 -06:00
Thomas S Hatch
6edf196533 Merge pull request #25568 from twangboy/fix_25206
Fixed win_useradd module to add fullname
2015-07-21 08:30:25 -06:00
Rudy Attias
4b7dc96919 use explicit utf-8 decoding (#25532)
since salt.utils.sdecode() is bias toward system encoding(defaults to cp1252) and it differs from the strings returned from _get_reg_software() (utf-8)
(#25532)
2015-07-21 14:25:11 +03:00
David\ Beitey
9ad0ddc549 Allow parent relative includes in state files
This implements the solution to #25477.  Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.

This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html),
which supported relative includes, excludes, and prefixed states.  This
PR expands on existing tests for stateconf.

This also updates the documentation accordingly.
2015-07-21 16:32:38 +10:00
Nicole Thomas
469662650c Merge pull request #25566 from techhat/issue25475
Fix download process for SPM repo updates
2015-07-20 20:44:55 -06:00
twangboy
fbee445c6d Commented out a pylint error 2015-07-20 18:04:51 -06:00
Justin Findlay
a95353b4e3 add tcp transport to shell.key tests 2015-07-20 17:02:25 -06:00
Justin Findlay
5dadaec775 add tcp transport to jenkins and runtests 2015-07-20 16:56:00 -06:00
Justin Findlay
3083c71ec3 add tcp transport opt to test runner 2015-07-20 16:52:48 -06:00
Nicole Thomas
a8367967cc Merge pull request #25553 from techhat/softlayerbootstrap
Switch SoftLayer to salt.utils.cloud.bootstrap()
2015-07-20 16:45:10 -06:00
Nicole Thomas
439334233a Merge pull request #25552 from techhat/softlayerprices
Update pricing for SoftlayerHW
2015-07-20 16:44:11 -06:00
Nicole Thomas
0b29481a6a Merge pull request #25547 from techhat/parallelsbootstrap
Switch Parallels to salt.utils.cloud.bootstrap()
2015-07-20 16:43:47 -06:00
rallytime
b213049ee8 Pylint 2015-07-20 16:41:44 -06:00
Gilles Dartiguelongue
49cec9f9a1 Use a more persistent tmp directory
Per FHS, /var/tmp contains temporary files and directories that are not
cleaned up across system reboots. It looks like some commands in the
bootstrap process resulted in "boots" of the LXC inadvertently cleaning
/tmp while its content was still needed. No such problem occurs when
/var/tmp is used.
2015-07-21 00:30:20 +02:00
rallytime
f9e5317284 Don't require a profile size for scaleway driver 2015-07-20 16:18:49 -06:00
rallytime
faabb30bb0 Don't stacktrace when provisioning instances with scaleway 2015-07-20 16:15:28 -06:00
rallytime
8ed562f4c9 Fix create function in OpenNebula driver 2015-07-20 16:09:42 -06:00
Gilles Dartiguelongue
96a672f8e0 Do not execute bootstrap script twice 2015-07-21 00:08:17 +02:00
twangboy
4b56dc3893 Fixed win_useradd module to add fullname 2015-07-20 15:32:28 -06:00
Mike Place
3c32b0b669 Merge pull request #25561 from twangboy/fix_21041_again
Fixed the gem module to work on windows... without injection
2015-07-20 15:12:15 -06:00
Joseph Hall
c19fdf1ad0 Fix download process for SPM repo updates 2015-07-20 14:08:11 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
2015-07-20 13:55:14 -06:00
twangboy
aaf3f3dcd0 Fixed some line and style issues 2015-07-20 13:42:50 -06:00
twangboy
e6d0e5cda7 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again 2015-07-20 13:42:31 -06:00