valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,819 Commits 24 Branches 182 Tags 341 MiB
3fe4a75a7f
Commit Graph

55819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
3fe4a75a7f Merge pull request #25578 from davidjb/relative-includes 
Allow parent relative includes in state files
 2015-07-22 10:51:12 -06:00
Justin Findlay
f4ad36b282 Merge pull request #25610 from s0undt3ch/hotfix/bootstrap-script-2015.8 
[2015.8] Update the bootstrap script to latest release v2015.07.22
 2015-07-22 09:04:57 -06:00
Pedro Algarvio
165f9ae659 Update the bootstrap script to latest release v2015.07.22 
* Fix tornado installation in Ubuntu. Thanks Yushi Nakai. saltstack/salt-bootstrap#627
* Install tornado using pip on Ubuntu for Salt's v2015.8.xx onward stable releases.
* Install requests on Ubuntu from Chris Lea's PPA. saltstack/salt-bootstrap#630
 2015-07-22 13:24:30 +01:00
Justin Findlay
5c94fe3ad3 Merge pull request #25599 from jfindlay/tcp_test 
fix transport settings in #25596
 2015-07-21 17:43:45 -06:00
Justin Findlay
146e6e519a fix transport settings in 3083c71 2015-07-21 16:42:33 -06:00
Mike Place
89e0f151fa Merge pull request #25596 from jfindlay/tcp_test 
Tcp test
 2015-07-21 16:34:56 -06:00
Mike Place
50c331c592 Merge pull request #25591 from garethgreenaway/25560_2015_8_schedule_return_data 
Return data for scheduled jobs in 2015.8 default to True.
 2015-07-21 15:53:52 -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
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
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
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
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
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
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
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
Mike Place
c6f241d908 Merge pull request #25548 from techhat/proxmoxbootstrap 
Switch Proxmox to salt.utils.cloud.bootstrap()
 2015-07-20 13:29:24 -06:00
Colton Myers
2117ac8022 Merge pull request #25563 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-07-20 13:27:36 -06:00
Mike Place
2dc601c7fa Merge pull request #25543 from techhat/gcebootstrap 
Switch GCE to salt.utils.cloud.bootstrap()
 2015-07-20 13:27:29 -06:00
Colton Myers
3bf2f1a722 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/minion.py
 2015-07-20 13:26:44 -06:00
Joseph Hall
b23cfaa11b Set default to 1800 as per @underscorephil 2015-07-20 13:08:15 -06:00
Nicole Thomas
2240d84a0b Merge pull request #25546 from techhat/cloudstackbootstrap 
Switch CloudStack to salt.utils.cloud.bootstrap()
 2015-07-20 11:51:35 -06:00
Mike Place
50c257b1d5 Merge pull request #25559 from cachedout/lint_win_pkg 
Lint win_pkg
 2015-07-20 11:46:29 -06:00
Mike Place
53a00add99 Lint win_pkg 2015-07-20 11:45:57 -06:00
Mike Place
7c7015ccda Merge pull request #25556 from attiasr/patch-1 
fix for #25532
 2015-07-20 11:45:11 -06:00
Mike Place
3c73dab2ce Merge pull request #25554 from jfindlay/verify_ssl 
verify_ssl=True for s3 ext pillar
 2015-07-20 11:43:38 -06:00
Mike Place
e3e2e6718e Merge pull request #25551 from rallytime/bp-25530 
Backport #25530 to 2015.5
 2015-07-20 11:43:00 -06:00
Mike Place
9a046e9e0e Merge pull request #25558 from cachedout/lint_config_test 
Lint config_test
 2015-07-20 11:19:05 -06:00
Mike Place
89d595f002 Lint config_test 2015-07-20 11:18:31 -06:00
Mike Place
25f910e472 Merge pull request #25515 from s0undt3ch/2015.8 
salt.utils.schema fixes
 2015-07-20 11:17:35 -06:00
Joseph Hall
dcdc4ef99d Linting 2015-07-20 10:55:03 -06:00
Rudy Attias
9b224e8d4e fix for #25532 
fix for #25532, convert name_map keys to unicode to be able to compare it with the keys from _get_reg_software()
 2015-07-20 19:14:24 +03:00
Justin Findlay
ca3ab4e737 verify_ssl=True for s3 ext pillar 
Fixes #25538.
 2015-07-20 09:43:59 -06:00