Commit Graph

9082 Commits

Author SHA1 Message Date
Thomas S Hatch
65db151c38 Merge pull request #3040 from techhat/iptables
Support optparse in python 2.6
2012-12-27 09:15:45 -08:00
Thomas S Hatch
148a368b95 Merge pull request #3038 from s0undt3ch/hotfix/pylint-virtualenv
Add virtualenv support to `.pylintrc`
2012-12-27 09:13:49 -08:00
shadowfax-chc
75dcb60846 Added depclean function to eubild module.
Portage supports a function, depclean, which removes old dependencies.
If a package is provided, emerge will only remove it if no other package
depends on it.
2012-12-27 12:10:52 -05:00
Thomas S Hatch
ba42755935 Add explanation of "issue" to overstate doc 2012-12-27 09:55:15 -07:00
Thomas S Hatch
72015b0034 Merge pull request #3033 from s0undt3ch/issues/3032
Fix some "`NameError`s" introduced when fixing #3015. Fixes #3032.
2012-12-27 08:49:28 -08:00
Joseph Hall
7cceb1e5af Merge pull request #3039 from shadowfax-chc/develop
Modified ebuild upgrade command to preform a full system upgrade.
2012-12-27 08:48:03 -08:00
Thomas S Hatch
2971bf4e8e Merge pull request #3031 from archtaku/docs
Add missing config params to minion conf docs
2012-12-27 08:46:44 -08:00
Joseph Hall
b949a56492 Support optparse in python 2.6 2012-12-27 11:45:26 -05:00
Thomas S Hatch
fb33132f27 Merge pull request #3028 from SEJeff/develop
Add 'user.list_users'
2012-12-27 08:43:07 -08:00
Jeff Schroeder
91a9f12f9e Merge pull request #3036 from s0undt3ch/issues/2926
Properly avoid "File name too long" ZMQ exceptions.
2012-12-27 08:16:47 -08:00
shadowfax-chc
21cabcd489 Modified ebuild upgrade command to preform a full system upgrade. see
http://www.gentoo.org/doc/en/handbook/handbook-amd64.xml?part=2&chap=1#doc_chap3
"Code Listing 3.13: Performing a full update"
2012-12-27 11:05:31 -05:00
Pedro Algarvio
1ee445dcd0 Removed left over break and corrected grammar. 2012-12-27 15:52:15 +00:00
Pedro Algarvio
f702989091 Properly avoid "File name too long" ZMQ exceptions. Refs #3026, #2044 and #2926.
We do a proper length check when using the sockets in IPC mode and fail when it reaches 103 which is the lower value for this error on BSD systems, Linux and Solaris is 107. We just exit the master/minion since continuing would mean leaving it crippled.
2012-12-27 15:39:32 +00:00
Pedro Algarvio
06ab864c12 Oops, we can't just exit on the init-hook.
The encoded string now looks like:
```python
import os, sys

if 'VIRTUAL_ENV' in os.environ:

    ve_dir = os.environ['VIRTUAL_ENV']
    ve_dir in sys.path or sys.path.insert(0, ve_dir)
    activate_this = os.path.join(os.path.join(ve_dir, 'bin'), 'activate_this.py')

    # Fix for windows
    if not os.path.exists(activate_this):
        activate_this = os.path.join(os.path.join(ve_dir, 'Scripts'), 'activate_this.py')

    execfile(activate_this, dict(__file__=activate_this))
```
2012-12-27 15:14:02 +00:00
Pedro Algarvio
45bcbef05a Add virtualenv support to .pylintrc
Include the current active virtualenv into pylint's init-hook.
The `base64` encoded string is:
```python
import sys, os

if 'VIRTUAL_ENV' not in os.environ:
    sys.exit(0)

ve_dir = os.environ['VIRTUAL_ENV']
ve_dir in sys.path or sys.path.insert(0, ve_dir)
activate_this = os.path.join(os.path.join(ve_dir, 'bin'), 'activate_this.py')

if not os.path.exists(activate_this):
    activate_this = os.path.join(os.path.join(ve_dir, 'Scripts'), 'activate_this.py')

execfile(activate_this, dict(__file__=activate_this))
```
2012-12-27 15:02:40 +00:00
Jeff Schroeder
2bba695efc Merge pull request #3035 from gotcha/patch-2
Update doc/ref/states/highstate.rst
2012-12-27 06:59:41 -08:00
Jeff Schroeder
6185e4cda0 Merge pull request #3034 from s0undt3ch/develop
Warn if a module is wrongly returning `None` instead of `False`.
2012-12-27 06:57:38 -08:00
Pedro Algarvio
6fdea732a4 Fix my own typo from previous commit. 2012-12-27 10:52:12 +00:00
Pedro Algarvio
b450132ba8 Typo(Thanks @lyxint) and PEP-8. 2012-12-27 10:51:19 +00:00
Godefroid Chapelle
ef00765f30 Update doc/ref/states/highstate.rst
More details in large example
2012-12-27 10:47:23 +01:00
Pedro Algarvio
a85eb24e6d Warn if a module is wrongly returning None instead of False.
* Fixed the `brew` and `sysbench` modules which were returning `None` instead of `False`.
* Additionally, regarding the module `sysbench`, @sharan-monikantan, why are the parsed returned keys white-space padded?
2012-12-27 09:24:26 +00:00
Pedro Algarvio
0255c8d583 Switch self.event.destroy() with del(self.event) which should be the same. 2012-12-27 09:07:20 +00:00
Pedro Algarvio
74156cff72 Fix some "NameErrors" introduced when fixing #3015. Fixes #3032.
* Additionally also terminate worker processes on `.destroy()`.
2012-12-27 08:57:47 +00:00
Erik Johnson
8bb8143ee3 Add missing config params to minion conf docs
I noticed earlier tonight when I added some information to the "hacking"
docs that my "root_dir" and "sock_dir" links were not actually linking
to anything, and found that they were missing from the minion
configuration page. It turns out that there were a good many params that
hadn't made their way into the docs yet, so I added as many of them as
I could identify.
2012-12-26 22:58:35 -06:00
Jeff Schroeder
b71f933207 Add 'user.list_users' 2012-12-26 22:39:36 -06:00
Jeff Schroeder
04f7f1913d modules.useradd: mark salt._compat.callable as _callable 2012-12-26 22:14:18 -06:00
Jeff Schroeder
8318ee6a71 modules.useradd: use absolute path for copy.deepcopy
Otherwise, user.deepcopy shows up as an available function when
looking at the module docs for the user module via salt-call user -d
2012-12-26 22:11:47 -06:00
Jeff Schroeder
d1c4b126bd Merge pull request #3026 from archtaku/docs
hacking docs: fix mixed up info on pid files
2012-12-26 19:03:55 -08:00
Erik Johnson
9a878c7400 Update hacking docs 2012-12-26 20:44:15 -06:00
Thomas S Hatch
2e81ce83a1 Merge pull request #3024 from s0undt3ch/issues/3015
Fix #3015
2012-12-26 09:33:39 -08:00
Thomas S Hatch
1049712c24 Merge pull request #3023 from s0undt3ch/issues/3016
Only setup the console logger if we're not daemonizing. Fixes #3016.
2012-12-26 09:31:09 -08:00
Pedro Algarvio
4cab256fb5 Don't touch closed ZMQ socket's and/or context's. Fixes #3015.
* On some occasions it seems that `salt.utils.event.SaltEvent.destroy()` is called twice and the errors exhibited on #3015 would show up on the second time we would try to set the linger socket option since that socket was already closed. So, even though on some parts of code which I changed in this commit weren't giving any problems, I ended up using the same recipe all around, if the socket is open, set the linger option and close it, plus, if open, also close the context.
2012-12-26 14:58:07 +00:00
Pedro Algarvio
c87f035bef Convert tabs to spaces. Refs #3015. 2012-12-26 12:55:51 +00:00
Pedro Algarvio
9ce221cd05 Only setup the console logger if we're not daemonizing. Fixes #3016. 2012-12-26 12:48:33 +00:00
Thomas S Hatch
2b96dfcba0 Merge pull request #3020 from archtaku/issue3008
Remove platform-specific code from pkg state
2012-12-25 23:10:52 -08:00
Erik Johnson
e93aab98e6 Remove platform-specific code from pkg state
Platform-specific code from #3019 has been moved to pkg_resource module.
This code may evolve a bit down the road. Presently it will only check
syntax if the package is coming from the portage tree via ebuild.
However, future support for entropy (binary pkg manager), as well as
expanding syntax checking for binary package files should be considered
TODO items.
2012-12-26 00:34:55 -06:00
Thomas S Hatch
a431b27d91 Merge pull request #3019 from archtaku/issue3008
Force Gentoo-based distros to use full pkg name
2012-12-25 21:19:42 -08:00
Thomas S Hatch
e06ad3d3ba Merge pull request #3018 from techhat/develop
Add basic Linux LVM support
2012-12-25 21:18:52 -08:00
Thomas S Hatch
fbfd30b230 Merge pull request #3013 from whiteinge/sysdoc-runner
Added sys.doc runner
2012-12-25 20:55:24 -08:00
Thomas S Hatch
54268e780a Merge pull request #3011 from torhve/develop
Fix problem with attribute checks when data looks like:
2012-12-25 20:54:17 -08:00
Joseph Hall
8bce0bbbac Don't need re 2012-12-25 11:34:36 -05:00
Joseph Hall
daba5cef48 Add basic Linux LVM support 2012-12-25 11:30:24 -05:00
Jeff Schroeder
e3227f2914 Use the correct path to ZMQBaseError for older zmq versions
Fixes a FTBFS with older zmq I accidentally introduced.
2012-12-25 10:10:17 -06:00
Jeff Schroeder
7b27e65f42 Merge pull request #3014 from FireHost/fix_debian_grains_again
Fix Debian grains again
2012-12-24 09:56:04 -08:00
Jeff Schroeder
7072ada380 windows code review update thanks to @s0undt3ch 2012-12-24 11:44:05 -06:00
Aaron Tygart
00b6988405 Revert unnecessary change from 826e7e4d66.
* Add documentation for logic of _OS_NAME_MAP and _OS_FAMILY_MAP
2012-12-24 10:58:23 -06:00
Aaron Tygart
5544bb8182 Add 'debiangnu/' to the os name map 2012-12-24 10:52:22 -06:00
Tor Hveem
7a4469ae56 Add "" around values, so yaml doesn't serialize to datetime and etc. 2012-12-24 11:51:51 +01:00
Tor Hveem
0003559f5a Remove debugging that got left in 2012-12-24 11:46:00 +01:00
Seth House
cecf2a457b Added sys.doc runner
Fixes #2954
2012-12-24 02:59:07 -07:00