Commit Graph

8968 Commits

Author SHA1 Message Date
Tor Hveem
ce34e90181 Fix problem with attribute checks when data looks like:
"[(u'bus', u'ide'), (u'dev', u'hdb')]"
2012-12-23 23:10:08 +01:00
Jeff Schroeder
45be9c2a54 modules.brew: make __virtual__() properly return False 2012-12-22 10:38:07 -06:00
Jeff Schroeder
82848767db Fix a bug in the loader
Several modules where __virtual__() were returning None were being
improperly loaded. Any __virtual__() that returns a string will
never evaluate to False when cast to a bool() so "if not virtual"
will do the right thing as we get more and more modules that might
not necessarily be written up to standard (until we can fix them)
2012-12-22 10:38:03 -06:00
Thomas S Hatch
84d9a31a36 Merge pull request #3004 from SEJeff/fix-unit-tests
Fix unit tests
2012-12-22 08:25:15 -08:00
Jeff Schroeder
3756a835ad Merge pull request #3006 from tf198/develop
Updated comments for root_dir
2012-12-21 22:14:24 -08:00
Tris Forster
3b0069db39 Updated config comments to reflect 8d723cd (pidfile / root_dir) 2012-12-22 17:03:19 +11:00
Jeff Schroeder
7dd0bbe74c Merge pull request #3003 from archtaku/docs
Provider doc enhancements
2012-12-21 21:44:16 -08:00
Jeff Schroeder
7a45b19da0 Merge pull request #3002 from archtaku/develop
Minor correction to comments
2012-12-21 21:42:23 -08:00
Jeff Schroeder
8b74360493 Skip the git state tests if a dns lookup to github.com fails
This is the quickest clever thing I could think of while running the
unit tests offline in the car during a long road trip.
2012-12-21 23:32:11 -06:00
Jeff Schroeder
5b60edcfb6 Don't nuke the tests because event self.destroy() always blows up 2012-12-21 23:32:02 -06:00
Erik Johnson
db13bb7d01 Minor correction to comments
The __virtual__ function in freebsdpkg.py has a comment that refers to
Arch Linux. Corrected this to "FreeBSD".
2012-12-21 21:44:43 -06:00
Erik Johnson
92ab669a1f Provider doc enhancements
1) Added an example for the minion config option "providers".

2) Cleaned up line widths on solaris install instructions, and added
   information on how to use pkgutil as the default package provider.

3) Since systemd is the default provider for Arch Linux now, I corrected
   the information in the "State Providers" page so that the example of
   overriding the service provider reflects the current state of the
   codebase.
2012-12-21 21:40:01 -06:00
Jeff Schroeder
4da4dc25a1 Skip the virtualenv state test if virtualenv isn't installed 2012-12-21 21:35:58 -06:00
Thomas S Hatch
edf576394c Merge pull request #3001 from archtaku/develop
Make pkgutil.py import as pkgutil instead of pkg
2012-12-21 17:05:53 -08:00
Thomas S Hatch
9cae1e64dd Merge pull request #3000 from jacksontj/develop
Salt State pkg.installed enforce package versions
2012-12-21 16:59:11 -08:00
Erik Johnson
f7af12940c Make pkgutil.py import as pkgutil instead of pkg 2012-12-21 18:58:21 -06:00
Thomas Jackson
0b5ce09f75 Salt State pkg.installed enforce package versions
Previously if there was a version installed (any version) it would return as "enforced" this patch makes sure that salt state enforces the correct version.
2012-12-21 16:55:51 -08:00
Thomas Jackson
acd949c6db Salt State pkg.installed enforce package versions 2012-12-21 16:52:07 -08:00
Thomas S Hatch
614f0dfeba Merge pull request #2998 from jacksontj/develop
Add "version" kwarg to yumpkg
2012-12-21 16:45:08 -08:00
Thomas Jackson
c403239243 Add "version" kwarg to yumpkg
this allows modules to specify the version in a kwarg, like the other package modules
2012-12-21 16:42:32 -08:00
Thomas S Hatch
88de1e5ac8 Merge pull request #2997 from torhve/develop
Better error handling when state doesn't return a dictionary
2012-12-21 16:42:20 -08:00
Thomas S Hatch
c3e2c6fb5b Merge pull request #2996 from archtaku/issue2994
Restrict import of pkgutil.py to Solaris only
2012-12-21 16:40:35 -08:00
Thomas S Hatch
a2d0d22e97 Merge pull request #2991 from archtaku/docs
More clarification/correction to hacking docs
2012-12-21 16:40:14 -08:00
Thomas S Hatch
dbd0d992cf Merge pull request #2993 from jacksontj/develop
Adding use_list to msgpack, this is due to msgpack depricating the defau...
2012-12-21 16:32:30 -08:00
Tor Hveem
41be17299d Catch exception when state does not return dictionary. Also print the
error producing state.
2012-12-22 01:29:41 +01:00
Erik Johnson
f9495b3add Restrict import of pkgutil.py to Solaris only
This fixes #2994.
2012-12-21 18:29:12 -06:00
Thomas S Hatch
eba4b89b9b Merge pull request #2992 from tf198/develop
Make pidfile respect root_dir setting
2012-12-21 16:26:22 -08:00
Erik Johnson
36252d5dfb Add notes for developing on RedHat variants 2012-12-21 18:23:33 -06:00
Thomas Jackson
0c09094102 Adding use_list to msgpack, this is due to msgpack depricating the default use_list 2012-12-21 14:55:22 -08:00
Tris Forster
8d723cddc1 Make pidfile respect root_dir setting 2012-12-22 09:25:08 +11:00
Erik Johnson
5b3e592fd0 More clarification/correction to hacking docs
Running pip install -e /path/to/git/clone from within the virtualenv
does not also install salt's additional required modules, as the
document suggests. I ran into this issue last week and so did a guy I
was helping troubleshoot in #salt.

Also, I clarified the bit about using --system-site-packages in your
virtualenv.
2012-12-21 16:00:50 -06:00
Thomas S Hatch
54ac2e23f6 Merge pull request #2990 from tchap/doc/emerge_salt
Make sure the Portage package name is unambiguous
2012-12-21 11:02:39 -08:00
Ondrej Kupka
f49506f38e Make sure the Portage package name is unambiguous 2012-12-21 19:20:41 +01:00
David Boucha
8d5fbce01b Merge pull request #2989 from tchap/doc/emerge_salt
Update Gentoo installation manual
2012-12-21 10:20:29 -08:00
Ondrej Kupka
bfe70f7405 Update Gentoo installation manual 2012-12-21 19:05:33 +01:00
Thomas S Hatch
b0a5477e49 Merge pull request #2988 from sharan-monikantan/develop
SysBench module for testing salt minions
2012-12-21 09:30:27 -08:00
Sharan Kumar Monikanta Rajan
069d6ecf19 SysBench module for testing salt minions
SysBench is a benchmark tool for measuring the system parameters. This module helps in analyzing the minions right from the master. This helps in scenarios like load balancing
2012-12-21 09:08:24 -08:00
Thomas S Hatch
8df22ce3bf Merge pull request #2985 from akoumjian/develop
Add bootstrap and prioritize platform instructions to install
2012-12-21 08:31:35 -08:00
Alec Koumjian
26ac0437fe Add bootstrap and prioritize platform instructions to install 2012-12-20 21:21:59 -08:00
Thomas S Hatch
3d0dfbebf9 Merge pull request #2983 from cedwards/freebsd
Added test to support alternate SERVICE_DIR location
2012-12-20 19:45:18 -08:00
Christer Edwards
b352bca972 Added test to support alternate SERVICE_DIR location 2012-12-20 20:42:32 -07:00
Thomas S Hatch
5968eaf6d8 Merge pull request #2982 from UtahDave/develop
Add Alpha version of Windows Package Manager!!
2012-12-20 17:10:41 -08:00
David Boucha
1e9bdb1370 Squashed commit of the following:
commit 56829e8239ee88f2672d1f749ef3b3765d190604
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 18:06:04 2012 -0700

    remove debug prints

commit ab326554b1d8851fed064231d4b9d090c9d0f6ed
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:46:02 2012 -0700

    quotes around windows installer with spaces in name

commit 49fb4043f353f4d28c9e6ad1b4e005922c7722d4
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:41:11 2012 -0700

    iiiiiii

commit 0245dc47c56de7e43a5d85e850a296309e580963
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:27:31 2012 -0700

    lkj

commit 26645963de84149c51ac5cbaef91148e94585da0
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:25:16 2012 -0700

    try again

commit ab9a5cd249c7e1558a3c87b6b4ba3933ddd043ca
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:21:41 2012 -0700

    lkjljlkjl  PLEASE work!!!

commit c024bc956dbb05a0617454d17b8b3df8d34f949a
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:15:40 2012 -0700

    lkjlkj

commit 3eb610e1fef7a1efed021bc71ba48a89ec2af23b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:08:21 2012 -0700

    stuff

commit 59f9dd76f60799db4b68d8ccd10854a2ad01f930
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:02:34 2012 -0700

    another fix

commit 1dfe105829cbddcf37d0e029b6f8351c72a58269
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:59:35 2012 -0700

    moar bug fixes

commit acbaf246b1ddcd8a309fe0d6416ce61a0fe34f8b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:48:58 2012 -0700

    fix moar bugs

commit 5731af3eb9b2446d6a1466918fceaa08b3331b9e
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:44:46 2012 -0700

    fix it

commit 532abe6b4c8691b0c67078ac76490cd83e602c9b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:40:04 2012 -0700

    First try at installing windows software

commit edc05e3239c94d3b143ab63df661995782352766
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 15:45:56 2012 -0700

    try to avoid keyerrors

commit 216734db63de5e964e2c79b3eae2a203780e1eaf
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:48:02 2012 -0700

    fix  typo

commit dc20f405e13e06dd0f6322f1c1275e2d2bf4ba57
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:45:27 2012 -0700

    fix available version

commit 41669aca4f5d1f6ca4d0b089ba5753a3554a0c3e
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:32:17 2012 -0700

    Start filling out availabe version()

commit 3898f00202a427bb70c7e33dfd8b6eee1e9bbecd
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 15:49:23 2012 -0700

    change cache file extension, update refresh_db()

commit 600696ea3e0638331f1d71fb294f982652d73799
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 14:16:10 2012 -0700

    add default win repo location

commit f9fdb11efd434e4d9df2ab5b62daf6042d770230
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 14:12:15 2012 -0700

    rename location of win cache file on master

commit a260eaddacbb22c4b3ae391f18cf19ef299de3d8
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 13:40:27 2012 -0700

    Unify the name of the windows repo cache file
2012-12-20 18:07:56 -07:00
Thomas S Hatch
27c0d1195e Fix more whitelist errors 2012-12-20 17:56:35 -07:00
Thomas S Hatch
59f1c6bc50 fix loader whitelist typo in eauth 2012-12-20 16:57:35 -07:00
Thomas S Hatch
cec7b43139 Make masterminion class accept whitelist 2012-12-20 16:51:52 -07:00
Thomas S Hatch
7928f2261c Trim the master minion modules 2012-12-20 16:47:55 -07:00
Thomas S Hatch
56955c7d8b Add whitelist hooks to loader functions 2012-12-20 16:18:57 -07:00
Thomas S Hatch
d217fd9f49 update contents to have the git policy 2012-12-20 16:08:10 -07:00
Thomas S Hatch
f687d1fa17 Merge pull request #2980 from jhutchins/develop
Develop
2012-12-20 14:53:51 -08:00