Commit Graph

36003 Commits

Author SHA1 Message Date
Pedro Algarvio
52d0d01d09 Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Pedro Algarvio
e9fbd9910d Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Pedro Algarvio
8d9570ef43 Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Joseph Hall
130e0842c8 Merge pull request #16566 from terminalmage/docs
Minor wording fix in highstate docs
2014-10-11 06:34:39 -06:00
Joseph Hall
6706b64e5a Merge pull request #16569 from s0undt3ch/hotfix/vt-freezes-on-osx
No need to check if process is alive. Fixes #16487. Refs #16317.
2014-10-11 06:33:02 -06:00
Pedro Algarvio
79d89c7353 No need to check if process is alive. Fixes #16487. Refs #16317.
There's no need to check for a live process because since we're changing flags on the file descriptor, if it's not none, we
reset the flags.
2014-10-11 07:39:57 +01:00
Pedro Algarvio
ba834069e7 We need to decompress the eggs and include plain files in the thin tarball 2014-10-11 07:28:15 +01:00
Pedro Algarvio
09a524f696 Properly think python .egg's. Fixes #16567 2014-10-11 05:36:57 +01:00
Seth House
bbbfca8a87 Merge remote-tracking branch 'upstream/pr/16557' into 2014.7 2014-10-10 21:26:33 -06:00
Erik Johnson
af64f17fe4 Minor wording fix in highstate docs
This fixes some grammar weirdness.
2014-10-10 22:25:55 -05:00
Thomas Jackson
aa98ce3e28 Move to use lambda, to keep pylint happy 2014-10-10 17:19:13 -07:00
Thomas Jackson
aaf0069dd6 Wrap the split modules in objects, so we can avoid the attr/value ordering problem 2014-10-10 16:40:24 -07:00
Nicole Thomas
bb7dd9c8b7 Merge pull request #16562 from rallytime/bp-16559
Backport #16559 to 2014.7
2014-10-10 17:35:20 -06:00
Mike Place
cca7b80786 Pillar overwrite merge stategy 2014-10-10 16:38:19 -06:00
rallytime
7e09896c7c Clean up boto_secgroup unit test
This test required some tweaks as there are new versions of boto and moto
2014-10-10 16:35:08 -06:00
Nicole Thomas
aa6f87e625 Merge pull request #16554 from juiceinc/2014.7
updated versionadded directive to a few modules (Helium -> 2014.7.0)
2014-10-10 16:16:21 -06:00
Colton Myers
3267e7a781 Merge pull request #16534 from cro/2014.7
Backport RAET timeout patch
2014-10-10 15:41:15 -06:00
Thomas Jackson
9e000ff512 Fix for #16455
This reverts 5fdd86, which introduced a self-referential dictionary-- which mean that it could never be garbage collected.
2014-10-10 14:16:04 -07:00
Tim O'Guin
7b5522bf2b updated versionadded directive to a few modules (Helium -> 2014.7.0) 2014-10-10 15:07:23 -05:00
Gareth J. Greenaway
3d13871b47 Fixing the mounted function in the mount state to ensure that a forced umount doesn't happen when test=True 2014-10-10 10:59:36 -07:00
Mike Place
4ed5706474 Remove expect fork from master upstart script
This could be related to the new process manager, but I haven't
investigated fully. At any rate, this allows Upstart to function
correctly when starting and stopping the salt master.
2014-10-10 11:36:57 -06:00
C. R. Oldham
c04b124ddd Merge branch '2014.7' of github.com:cro/salt into 2014.7 2014-10-10 11:24:11 -06:00
Samuel M Smith
9fa2fb4613 Changed how timeout works in RAETChannel 2014-10-10 11:22:56 -06:00
Thomas S Hatch
e715fdfe14 Start on new ssh ext_mods system 2014-10-10 11:21:37 -06:00
Seth House
ad4c662946 Merge pull request #16542 from rallytime/fix_minion_doc
Fix conf_minion references
2014-10-10 10:15:31 -06:00
rallytime
54b7abdb17 Fix conf_minion references 2014-10-10 09:19:27 -06:00
Pedro Algarvio
f12e59413f Merge pull request #16531 from whiteinge/ioflo-odict-yamldumper
Check for ioflo-flavored OrderedDicts as well when outputting YAML
2014-10-10 04:24:46 +01:00
Thomas S Hatch
14ff85445c Merge pull request #16532 from jacksontj/2014.7
fix for ping_on_rotate not in config
2014-10-09 19:49:22 -06:00
Samuel M Smith
234078c97f Changed how timeout works in RAETChannel 2014-10-09 19:15:57 -06:00
Thomas Jackson
a85a1a1059 fix for ping_on_rotate not in config
Since this isn't a default (in config.py), if you didn't set it you get backtraces from _clear_old_jobs:

```
Process Process-1:
Traceback (most recent call last):
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 232, in _bootstrap
    self.run()
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 88, in run
    self._target(*self._args, **self._kwargs)
  File "/home/thjackso/src/salt-github/salt/master.py", line 162, in _clear_old_jobs
    if self.opts['ping_on_rotate']:
KeyError: 'ping_on_rotate'
```
2014-10-09 17:37:03 -07:00
Seth House
7297f61674 Check for ioflo-flavored OrderedDicts as well when outputting YAML 2014-10-09 18:20:24 -06:00
Erik Johnson
b644232594 Suppress irrelevant log msg in virtual hardware detection
This commit suppresses a log warning when the minion is AIX, and none of
lspci, dmidecode, or dmesg are available.

This log message is just noise, especially in salt-call.
2014-10-09 18:16:41 -05:00
Joseph Hall
f49647a4e2 Merge pull request #16486 from rallytime/docs_minion_config
Add recon_* config options to minion docs
2014-10-09 17:08:29 -06:00
C. R. Oldham
9da5d13dbc Merge pull request #16422 from kev009/ipv6-fix
[2014.7] Hint PF type if bracket enclosed IPv6 address
2014-10-09 11:12:53 -06:00
Joseph Hall
ce441e36f9 Merge pull request #16503 from terminalmage/list-repo-pkgs
Fix output of pkg.list_repo_pkgs (yumpkg)
2014-10-09 08:19:15 -06:00
Thomas S Hatch
2186358d47 Merge pull request #16457 from cachedout/issue_10900
Don't modify pass-by-value copy of opts on module refresh
2014-10-09 08:17:56 -06:00
Thomas S Hatch
9bc652761a Merge pull request #16498 from rallytime/bp-16452
Backport #16452 to 2014.7
2014-10-09 08:17:23 -06:00
Erik Johnson
92b397d5ea Fix output of pkg.list_repo_pkgs (yumpkg)
This allows for the full list of available packages in each repo to be
returned. This was my original intention when I wrote this function, but
I didn't realize that I was missing versions in the output until I
researched github issue #16467.

The structure of the return dict had to be changed slightly to
accommodate the new behavior.

Additionally, rather than just sorting each list in place, this sorts
all versions for a given package in a given repo using
distuils.version.LooseVersion, to give an accurate sorting of versions,
and put the newest versions at the top of the list.
2014-10-09 01:34:10 -05:00
Thomas S Hatch
fecb0dfebb Merge pull request #16497 from thatch45/notes_2014.7
Add some release notes updates
2014-10-08 17:30:43 -06:00
David Boucha
2294fb5bfb properly fix windows paths for master storage 2014-10-08 17:03:45 -06:00
Mark Doliner
7ac4f42a99 Fix salt-cloud ec2 requests containing spaces.
salt-cloud receives an error when trying to create an EC2 instance when
any number of argument values contain a space. This happens because
salt-cloud is incorrectly building the url string when calculating the
signature. AWS signature algorithm #2 requires that spaces be encoded
using %20, however python's urlencode method replaces them with a +.
The easy fix is to just search and replace in the encoded string.

I encountered this myself with a security group with a space in it.
This was reported in issue #10181
https://github.com/saltstack/salt/issues/10181

The error looks like this:
someinstancename:
    ----------
    Errors:
        ----------
        Error:
            ----------
            Code:
                SignatureDoesNotMatch
            Message:
                The request signature we calculated does not match the signature you provided. Check your AWS Secret Access Key and signing method. Consult the service documentation for details.
    RequestID:
        12345678-9abc-def0-1234-56789abcdef0
2014-10-08 16:59:04 -06:00
Nicole Thomas
0ab7e3dab3 Merge pull request #16458 from basepi/pkgordereddict
Make OrderedDict private (_OrderedDict) in pkg state
2014-10-08 16:41:30 -06:00
Thomas S Hatch
678a551783 Add soem release notes updates 2014-10-08 16:40:34 -06:00
Seth House
57f2c4a4e3 Merge pull request #16494 from terminalmage/zeromq4
Add information on how to upgrade to ZeroMQ 4 in Ubuntu and RHEL/CentOS
2014-10-08 16:06:37 -06:00
Erik Johnson
8c80efd8eb Add info on upgrading to ZeroMQ 4 2014-10-08 16:56:28 -05:00
Erik Johnson
391a07e6ac Add info on upgrading to ZeroMQ 4 2014-10-08 16:51:33 -05:00
Erik Johnson
6ac209e6a7 Add example states for installing at and running atd 2014-10-08 16:50:47 -05:00
Colton Myers
efa72f0051 Merge pull request #16454 from basepi/typeerror
Remove the (often erroneous) missing arguments warning
2014-10-08 15:35:26 -06:00
Colton Myers
c559e7e6fb Merge pull request #16491 from basepi/2014.1.12releasenotes2
Add 2014.1.12 release notes (2014.7 branch)
2014-10-08 15:24:46 -06:00
Colton Myers
5e25de90e9 Add 2014.1.12 release notes 2014-10-08 15:22:33 -06:00