Commit Graph

30448 Commits

Author SHA1 Message Date
Erik Johnson
83d219fe05 Fix lint failure 2014-05-12 23:40:47 -05:00
Erik Johnson
35fd955da2 Catch exceptions raised when comparing timezone 2014-05-12 22:42:25 -05:00
Erik Johnson
fb5fc90c42 Raise exceptions when trying to read nonexistant files
Prevents a traceback when an invalid timezone is passed
2014-05-12 22:41:01 -05:00
Erik Johnson
d08b0a35d1 Improve jinja error reporting
Salt execution functions routinely raise SaltInvocationError and
CommandExecutionError exceptions. This commit catches them in the jinja
renderer and provides a nicely-formatted error message, preventing the
traceback from being in the render error that is printed to the CLI.
2014-05-12 22:37:25 -05:00
Joseph Hall
bf140ef7cb Merge pull request #12704 from KennethWilke/develop
clarified time related outputs, pep8'd slaveof
2014-05-12 10:15:52 -06:00
KennethWilke
1f4a9b7138 clarified time related outputs, pep8'd slavof 2014-05-12 11:13:20 -05:00
Samuel Smith
59ec38eceb Merge pull request #12703 from SmithSamuelM/sam_raet_39
Removed obsolete test file
2014-05-12 10:09:04 -06:00
Thomas S Hatch
f4e93421c0 Merge pull request #12659 from rallytime/state_file_append
Convert ints to strings when using file.append in sls file
2014-05-12 10:04:28 -06:00
Samuel M Smith
f1ab822972 Merge remote-tracking branch 'upstream/develop' into sam_raet_39 2014-05-12 10:03:23 -06:00
Thomas S Hatch
2fbd985a89 Merge pull request #12650 from makinacorpus/cachef
Fix performance for env scanning
2014-05-12 10:02:44 -06:00
Samuel M Smith
e17ee62de5 Removed obsolete test file 2014-05-12 10:01:40 -06:00
Joseph Hall
26d82510ac Merge pull request #12689 from terminalmage/issue12645
Fix shadowing of time module
2014-05-12 08:21:00 -06:00
Joseph Hall
d1b29b7c04 Merge pull request #12694 from gtmanfred/nova-private-ips
Fix private ips in nova.py
2014-05-12 08:06:48 -06:00
Joseph Hall
b73d393915 Merge pull request #12691 from gtmanfred/nova
Return True for volume_detached if volume is absent
2014-05-12 08:06:02 -06:00
Daniel Wallace
3dd2e3e420 Add docstring about volume not existing 2014-05-12 08:10:30 -05:00
Joseph Hall
9b8104778f Merge pull request #12692 from gtmanfred/authors
Add Daniel Wallace to developers
2014-05-12 06:37:16 -06:00
Daniel Wallace
b096fa20d1 Fix private ips in nova.py
The private_ip should not be the access_IPv4, it should be the private
ips from the address list.
2014-05-12 07:31:21 -05:00
Daniel Wallace
847e11d98c Return True for volume_detached if volume is absent
Technically it is detached.
2014-05-12 07:29:35 -05:00
Joseph Hall
ffe99fbd7b Merge pull request #12695 from holmboe/patch-2
Reflect the latest released version
2014-05-12 06:23:55 -06:00
Joseph Hall
563c7b8119 Merge pull request #12690 from gtmanfred/develop
Include a pvremove module and pvabsent state
2014-05-12 06:18:27 -06:00
Henrik Holmboe
fb03e79f97 Reflect the latest released version
This is a recurring problem in the release process. The same issue was pointed out for 2014.1.3 and is again a problem for 2014.1.4. Perhaps not the most severe issue here but I think it points to a bigger problem with the release management/process.

See https://github.com/saltstack/salt/issues/12032#issuecomment-41038471 for my comment and a discussion regarding the issue as a whole.
2014-05-12 12:57:27 +02:00
Daniel Wallace
7201037bc0 fix git.py state pylint problems 2014-05-12 00:50:41 -05:00
Daniel Wallace
689f7cf98e Add Daniel Wallace to developers
I just looked through the list... is this the right place?  meh

Also alphabetized the additions from the bottom
2014-05-12 00:49:39 -05:00
Daniel Wallace
0aea89c658 fix git.py state pylint problems 2014-05-12 00:15:45 -05:00
Daniel Wallace
bf58ea1452 check device names for physical volumes 2014-05-12 00:02:11 -05:00
Daniel Wallace
f1ec37d328 Fix the logic ordering of pv_absent 2014-05-11 23:35:14 -05:00
Daniel Wallace
4c154fb55b Include a pvremove module and pvabsent state
This is usefull for ensuring that the block device is removed from all
kernel memory.  This is required for detaching vdb's in xen.
2014-05-11 22:14:45 -05:00
Erik Johnson
50a720795a Fix shadowing of time module 2014-05-11 20:41:32 -05:00
Pedro Algarvio
e988137d90 Merge pull request #12688 from gtmanfred/develop
add missing parenthesis
2014-05-12 02:03:41 +01:00
Daniel Wallace
f3e7b0a190 add missing parenthesis 2014-05-11 18:20:39 -05:00
Seth House
0d685d123a Merge pull request #12526 from markizano/hotfix.11611
Addressing issues/concerns in #11611
2014-05-11 14:38:53 -06:00
Joseph Hall
1e99177c92 Merge pull request #12677 from gtmanfred/nova
Fix up some cloud stuff
2014-05-11 12:13:24 -06:00
Pedro Algarvio
adac7ba7e7 Merge pull request #12676 from garethgreenaway/ssh_host_key_fixes
Add missing ECDSA, ED25519 ssh key file types.
2014-05-11 15:06:38 +01:00
Joseph Hall
40dcf8793c Merge pull request #12667 from s0undt3ch/hotfix/ssh-tests
Ssh tests
2014-05-11 06:51:34 -06:00
Daniel Wallace
64cb2777cf Add warning about __exit__
Required for with: statement
2014-05-10 20:35:07 -05:00
Erik Johnson
710c9579cb Add clarification for pull #12678 2014-05-10 20:05:11 -05:00
Erik Johnson
d174a5c97a Merge pull request #12678 from eliasp/pkg_resource-deduplicate-pkg-versions
Drop duplicated versions in salt.modules.pkg_resource.sort_pkglist()
2014-05-10 20:03:39 -05:00
Daniel Wallace
31cd6786c6 fix capitalization in except statements
I blame vim.
2014-05-10 19:45:18 -05:00
Daniel Wallace
11d11fc0ad Fix pylint error 2014-05-10 19:26:03 -05:00
Elias Probst
cc87598c0a Drop duplicated versions in salt.modules.pkg_resource.sort_pkglist() 2014-05-11 02:23:14 +02:00
Daniel Wallace
66a3403efd Give a better error for failed servers
If there is a failed server without the 'progress' attribute, then
server_list_detailed fails.  This also fails with trying to start
anything that uses cloud, because it can't get the first command
started.
2014-05-10 19:19:18 -05:00
Gareth J. Greenaway
c8b89597f4 Add missing ECDSA, ED25519 ssh key file types. 2014-05-10 16:06:53 -07:00
Daniel Wallace
5f360dd0b8 Use the with_statement from python3
http://legacy.python.org/dev/peps/pep-0343/

call __exit__ correctly from novaclient

98934d7bf1 (diff-709c13ba674c4ae39f66e0ff604c1c21R172)
2014-05-10 17:58:25 -05:00
Daniel Wallace
5c0f62c312 Close with statement earlier
This stuff doesn't need to be in the with statement
2014-05-10 17:57:19 -05:00
Daniel Wallace
2310d0996e Requests has errors with ssl
If you don't use the __exit__ for closing out the connection on the
authentication, everything fails.

Unfortunately this isn't fully in novaclient yet.  Waiting for the tag
for python-novaclient 2.18 ... which isn't tagged yet.
2014-05-10 17:24:31 -05:00
Daniel Wallace
fcdfb6bc81 Catch errors for volume_show 2014-05-10 17:22:03 -05:00
Daniel Wallace
023757d086 reorganize the variables
Define everything to make sure that it goes to the correct variables.
2014-05-10 17:20:17 -05:00
Joseph Hall
1437967109 Merge pull request #12675 from gtmanfred/nova
Fix kwargs for volumes
2014-05-10 14:23:30 -06:00
Daniel Wallace
a5b20097a4 Fix kwargs for volumes
Makes sure that the correct bypass_url gets set for volumes.
2014-05-10 15:19:18 -05:00
Pedro Algarvio
df802117b1 Remove extra new line 2014-05-10 15:09:13 +01:00