Commit Graph

14397 Commits

Author SHA1 Message Date
Thomas S Hatch
4d7750d8fb Merge pull request #5560 from iMilnb/develop
pkgin may not be present in $PATH
2013-06-16 10:08:57 -07:00
Thomas S Hatch
1829503978 Merge pull request #5564 from s0undt3ch/hotfix/solaris-useradd
Mimic what was done in d19d744 but for Solaris.
2013-06-16 10:06:30 -07:00
Thomas S Hatch
0e91a87f2d Merge pull request #5563 from s0undt3ch/hotfix/solaris-shaddow
SmartOS joyent_20130322T181205Z does not have `spwd`. Provide an alternative.
2013-06-16 10:01:27 -07:00
Thomas S Hatch
6047075461 Merge pull request #5562 from zhangcheng/Fix_pip.list
Fix a bug of pip.list
2013-06-16 09:58:20 -07:00
Pedro Algarvio
bf91adda73 Mimic what was done in d19d744 but for Solaris. 2013-06-16 17:58:15 +01:00
Pedro Algarvio
8b0916edcf SmartOS joyent_20130322T181205Z does not have spwd. Provide an alternative. 2013-06-16 17:48:18 +01:00
ZHANG Cheng
6e48a29207 Fix a bug
Before:
$ salt-call pip.list tinypng
salt-dev:

git+https://github.com/saltstack/salt.git@77e758c2e8142d92298aa26db08ed6
af02506038
tinypng:
    1.2.0

After:
$ salt-call pip.list tinypng
tinypng:
    1.2.0
2013-06-17 00:10:38 +08:00
Thomas S Hatch
4adc055442 Merge pull request #5561 from s0undt3ch/hotfix/smartos-grains
Provide the `osfullname` grains for Solaris/SmartOS
2013-06-16 08:44:07 -07:00
Pedro Algarvio
8e1965a936 Provide the osfullname grains for Solaris. 2013-06-16 16:40:23 +01:00
Pedro Algarvio
ae273c3ee9 Provide the osfullname grains for SmartOS 2013-06-16 16:38:57 +01:00
Emile 'iMil' Heitor
5c7b9b741e use LOCALBASE instead of hardcoded path 2013-06-16 11:00:20 +02:00
David Boucha
77e758c2e8 Merge pull request #5559 from UtahDave/fix_nslookup
Make nslookup on Windows more robust
2013-06-16 00:48:01 -07:00
David Boucha
07acadf562 Make nslookup on Windows more robust
Handle ipv6 addresses better
Less fragile parsing
Fixes #5390
2013-06-15 23:59:45 -06:00
David Boucha
791dc85f4c Merge pull request #5533 from olliewalsh/win_packaging
Various fixes for windows package management module
2013-06-15 21:12:51 -07:00
Thomas S Hatch
c08ecdec9a Merge pull request #5558 from halfss/develop
fixed bug: cp.caches does not work
2013-06-15 18:33:00 -07:00
halfss
5b1ecede5f fixed bug: cp.caches does not work
var paths is a str like 'salt://kvm/qemu.conf,salt://kvm/init.sls'

when loop it,got a str 's',not 'salt://kvm/qemu.conf'

got error:
```
[root@localhost _modules]# salt 'minion1' cp.cache_files salt://kvm/qemu.conf,salt://kvm/init.sls
 <type 'str'>
cache_files
['salt://kvm/qemu.conf,salt://kvm/init.sls'] {}
salt://kvm/qemu.conf,salt://kvm/init.sls
testtttt salt://kvm/qemu.conf,salt://kvm/init.sls
minion1:
    Traceback (most recent call last):
      File "/usr/lib/python2.6/site-packages/salt/minion.py", line 426, in _thread_return
        ret['return'] = func(*args, **kwargs)
      File "/usr/lib/python2.6/site-packages/salt/modules/cp.py", line 240, in cache_files
        return __context__['cp.fileclient'].cache_files(paths, env)
      File "/usr/lib/python2.6/site-packages/salt/fileclient.py", line 126, in cache_files
        ret.append(self.cache_file(path, env))
      File "/usr/lib/python2.6/site-packages/salt/fileclient.py", line 116, in cache_file
        return self.get_url(path, '', True, env)
      File "/usr/lib/python2.6/site-packages/salt/fileclient.py", line 336, in get_url
        with contextlib.closing(url_open(url)) as srcfp:
      File "/usr/lib64/python2.6/urllib2.py", line 126, in urlopen
        return _opener.open(url, data, timeout)
      File "/usr/lib64/python2.6/urllib2.py", line 384, in open
        protocol = req.get_type()
      File "/usr/lib64/python2.6/urllib2.py", line 245, in get_type
        raise ValueError, "unknown url type: %s" % self.__original
    ValueError: unknown url type: s
```
2013-06-16 09:29:22 +09:00
Ollie Walsh
470c2eb66b Fix upgrade_available 2013-06-16 00:04:54 +01:00
Thomas S Hatch
ccb7046f1c Apply uupdates to the dropfile routine to salt key 2013-06-15 11:41:51 -06:00
Thomas S Hatch
cf7e116796 Set user of the running master 2013-06-15 11:34:13 -06:00
Emile 'iMil' Heitor
b5b0cb8c32 fallback to default location when PATH to /usr/pkg/bin is missing 2013-06-15 19:06:23 +02:00
Thomas S Hatch
3f88512c25 Merge pull request #5557 from bretep/develop
Add static route support into network state
2013-06-15 09:06:12 -07:00
Bret Palsson
72062e69f7 pep8 and remove a line
Just some simple pep8 cleanup and remove a unnecessary interface type.
2013-06-15 03:05:08 -05:00
Bret Palsson
75ffc61216 Merge remote-tracking branch 'upstream/develop' into develop 2013-06-15 01:54:41 -06:00
Thomas S Hatch
89d6d1241c Add initial prereq docs, this needs a lot more, and a tutorial 2013-06-15 00:44:54 -06:00
Bret Palsson
14b5bcf008 Fixed routes 2013-06-15 00:29:11 -06:00
Thomas S Hatch
ec0da497f8 Add a prereq_in requisite 2013-06-15 00:20:47 -06:00
Thomas S Hatch
0110762f82 fix recursive loop for bad prereq dec 2013-06-14 23:08:00 -06:00
Thomas S Hatch
af5a500e19 Merge pull request #5552 from hulu/bare-excepts
fixes to portage_config state
2013-06-14 21:22:38 -07:00
Thomas S Hatch
3b67a6ba1d Merge pull request #5555 from cvrebert/patch-2
add missing salt.utils import to modules.openbsdpkg
2013-06-14 21:22:13 -07:00
Thomas S Hatch
d0314db0d6 Merge pull request #5554 from cvrebert/patch-1
add missing initialization for syndic_wait in LocalClient.get_iter_returns
2013-06-14 21:20:30 -07:00
Thomas S Hatch
3d362b8a64 Clean up requisite in defs 2013-06-14 20:58:20 -06:00
Thomas S Hatch
b0dd11b596 Merge pull request #5551 from hulu/anomalous-backslashes
fix anomalous backslashes in docstring literals
2013-06-14 20:01:09 -07:00
Thomas S Hatch
546357d565 Merge pull request #5553 from jacksontj/develop
Adding docs for "depends" decorator
2013-06-14 19:36:55 -07:00
Chris Rebert
0e26ddfb0a add missing salt.utils import to modules.openbsdpkg
************* Module salt.modules.openbsdpkg
E0602: 37,23:list_pkgs: Undefined variable 'salt'
E0602: 39,7:list_pkgs: Undefined variable 'salt'
2013-06-14 18:29:40 -06:00
Chris Rebert
bd7b98d3a6 add missing initialization for syndic_wait in LocalClient.get_iter_returns()
************ Module salt.client
E0601:636,27:LocalClient.get_iter_returns: Using variable 'syndic_wait' before assignment
2013-06-14 17:26:17 -07:00
Thomas Jackson
f6cf1ee206 Adding docs for "depends" decorator 2013-06-14 17:19:53 -07:00
Chris Rebert
a19ab8f105 fixes to portage_config state 2013-06-14 17:18:55 -07:00
Chris Rebert
d2d1456d4e fix anomalous backslashes in docstring literals 2013-06-14 17:12:45 -07:00
Thomas S Hatch
3685f5a6b7 Add a new requisite!!! This commit adds the prereq requisite!
This requisite allows a state to be executed only if the required
state is expected to make changes to the system in the future.

So, if a script should only be run if a file is about to be changed
this can do it, or run a command BEFORE the system updates software.

This is useful to shut down a service before instaling an upgrade
and then restart the service after the upgrade
@jacksontj, you owe me a totorial or some docs on this one, I had
to seriously rack my brain to pull it off :) It is hard to find
out what is going to happen in the future!!

BTW, this is still experimental, and I have been able to get a
recursive loop with bad syntax, so be careful!
2013-06-14 17:47:42 -06:00
Bret Palsson
1383adbc35 Fix lost changes... argh github editor! 2013-06-14 16:50:42 -06:00
Thomas S Hatch
c04aa9ae55 Merge pull request #5549 from jacksontj/develop
Adding "Depends" decorator to salt.utils
2013-06-14 15:33:01 -07:00
Thomas Jackson
3016999c04 Adding "Depends" decorator to salt.utils
The Depends decorator allows you to optionally remove functions if sepecific globals/modules don't exist. This is particuarly helpful in larger scale deployments where some functions of the module work everywhere, but others require (for example) a service to be installed. This way you can avoid having to try/except all over the module to only load certain functions etc.
2013-06-14 15:17:06 -07:00
Thomas S Hatch
aaebae48ea Merge pull request #5547 from UtahDave/win_fix_ipv6
Win fix ipv6
2013-06-14 14:36:05 -07:00
Thomas S Hatch
039a4e49b1 Merge pull request #5545 from terminalmage/issue4765
Make cron.rm_job factor in temporal values.
2013-06-14 14:34:23 -07:00
Joseph Hall
a00d56873d Merge pull request #5548 from basepi/autosign5543
Fix regex (\Z, not \z) for autosign checking, Fix #5543
2013-06-14 14:25:36 -07:00
Colton Myers
0e3f4d7a2e Fix regex (\Z, not \z) for autosign checking, Fix #5543 2013-06-14 15:24:46 -06:00
David Boucha
6f572032ec Remove extra newline 2013-06-14 15:08:31 -06:00
David Boucha
6df94ddeb5 Properly parse Windows ipv4 and ipv6 IP addresses
Fixes #5391

Fixes #5377
2013-06-14 15:05:37 -06:00
Joseph Hall
aa4aa49e02 Merge pull request #5546 from basepi/pkgrepo5282
Make pkgrepo work for RHEL5 (yumpkg5.py), Fix #5282
2013-06-14 14:02:12 -07:00
Colton Myers
7912e4cc37 Re-namespace the imports from yumpkg.py 2013-06-14 14:54:45 -06:00