Colton Myers
097cc08af9
Merge pull request #13376 from cachedout/10423
...
More descriptive logging for token failures
2014-06-11 11:36:20 -06:00
Joseph Hall
6c41a30afa
Merge pull request #13377 from gtmanfred/develop
...
Closes #13369
2014-06-10 20:07:22 -06:00
Joseph Hall
49812d62f6
Merge pull request #13379 from gtmanfred/exec_ssh_cmd
...
don't always overwrite the error_msg
2014-06-10 20:06:09 -06:00
Pedro Algarvio
41578b8d38
Merge pull request #13367 from s0undt3ch/hotfix/jenkins
...
Decorate tests as expensive
2014-06-11 01:28:52 +01:00
Pedro Algarvio
e143c46501
Stop passing env. Use saltenv.
2014-06-11 01:22:47 +01:00
Daniel Wallace
17ba798e2c
fix pylint errors
2014-06-10 19:17:29 -05:00
Pedro Algarvio
5f2cc54160
Assert proper return types from state calls.
...
Just to be sure.
2014-06-11 01:12:13 +01:00
Pedro Algarvio
8b52c938ae
Merge pull request #13378 from rallytime/docstring_fix
...
Fixed docstring typo
2014-06-11 01:11:48 +01:00
Daniel Wallace
ae02fa609a
don't always overwrite the error_msg
...
error_msg='Failed to upload file {0!r}: {1}\n{2}', is in scp_file
2014-06-10 18:02:48 -05:00
rallytime
1576507cea
Fixed docstring typo
2014-06-10 16:49:54 -06:00
Daniel Wallace
f1f111acf1
Closes #13369
...
Need to set the password in vm_ which used to happen inside what is now
request_instance, but was never added.
2014-06-10 17:43:21 -05:00
Mike Place
00a85a0c25
More descriptive logging for token failures
2014-06-10 16:29:09 -06:00
Colton Myers
b807af5cbe
Merge pull request #13366 from terminalmage/refine-pkg-hold
...
Refine hold/unhold behavior in pkg.installed state
2014-06-10 16:25:48 -06:00
Colton Myers
ce3123e77e
Merge pull request #13374 from cachedout/10621
...
Move log levels in scheduler up
2014-06-10 16:23:42 -06:00
Erik Johnson
efc6c1f4f9
aptpkg: Fix call to get_selections()
...
This was passing "hold" as a name, not a quoted string (which succeeded
since there is a function named "hold" in the module), causing the
retrieved selections to be empty, leading to a traceback when the
function later tries to run set_selections().
2014-06-10 17:00:45 -05:00
Erik Johnson
6d580037e3
Add CommandExecutionError to exception handling
...
aptpkg's set_selections (called by hold/unhold) could potentially raise
this exception, so catch it as well.
2014-06-10 16:59:12 -05:00
Mike Place
ea67643ad7
Move log levels in scheduler up
...
Too much was being logged to debug. Make errors more promenent and
move job exec events up to info. Closes #10621
2014-06-10 15:44:33 -06:00
Erik Johnson
7f031f7c21
Remove yum-specific code
...
This is what happens when you copy and paste, and don't pay attention.
2014-06-10 14:28:44 -05:00
Pedro Algarvio
8b03cd8d2e
Decorate tests as expensive
...
Less trouble for the new runtests script
2014-06-10 19:25:04 +01:00
Pedro Algarvio
8ae3268037
Merge pull request #13339 from rallytime/cloud_tests
...
Cloud tests
2014-06-10 19:16:42 +01:00
Erik Johnson
67d36adb7c
Refine hold/unhold behavior in pkg.installed state
...
This adds exception handling to more gracefully report on problems
encountered while attempting to hold packages.
2014-06-10 13:15:43 -05:00
Erik Johnson
22adebef53
aptpkg: refine pkg.hold/unhold
...
This brings these functions more in line with Salt design standards, in
that an error case raises an exception which can be caught elsewhere.
Returning different data types depending on success or error, and then
doing type checking later on, is not pythonic.
2014-06-10 13:15:43 -05:00
Erik Johnson
0f5aeb7c20
yumpkg: refine pkg.hold/unhold
...
This brings these functions more in line with Salt design standards, in
that an error case raises an exception which can be caught elsewhere.
Returning different data types depending on success or error, and then
doing type checking later on, is not pythonic.
2014-06-10 13:15:43 -05:00
Thomas S Hatch
8f591c7adb
Merge pull request #13360 from lyft/refresh_db-flag-for-pkgrepo
...
Add refresh_db flag to pkgrepo.managed
2014-06-10 10:55:08 -07:00
Joseph Hall
3d37564c80
Merge pull request #13363 from nmadhok/fix-openstack-floating-ip
...
Fixes the problem where instance is unable to get public floating ip
2014-06-10 11:49:35 -06:00
Thomas S Hatch
6cdbeacdcd
Merge pull request #13336 from cachedout/13276
...
Change default behavior of _change_groups.
2014-06-10 10:36:07 -07:00
Thomas S Hatch
0ecaa6f5f4
Merge pull request #13330 from mgwilliams/nested-output
...
Improvement to nested output
2014-06-10 10:35:33 -07:00
nmadhok
34372fa136
Fixes the problem where instance is unable to get public floating ip
2014-06-10 13:12:00 -04:00
Ryan Lane
de6efaabb3
Add missing conditional for refresh_db in aptpkg.mod_repo
2014-06-10 09:46:14 -07:00
Ryan Lane
7da01dd617
Make refresh_db conditional in the aptpkg module
...
aptpkg.mod_repo will call refresh_db when a repo is added, so it's
unnecessary for pkgrepo.manage to call refresh_db as well.
2014-06-10 09:38:57 -07:00
rallytime
ce43e04769
change cloud docs to reflect runtest changes
2014-06-10 10:32:38 -06:00
rallytime
51896c4622
remove expensive test decorator and add run_test
2014-06-10 10:20:46 -06:00
Ryan Lane
ec17b90ab1
Add refresh_db flag to pkgrepo.managed
...
Though it's nice for the pkgrepo.managed to run apt-get update when
it adds a ppa, adding multiple ppa will cause it to be run multiple
times, which is slow. The refresh_db allows users to disable automatic
updates of the apt database, so that they can do so based on a wait
condition.
2014-06-10 09:15:28 -07:00
Pedro Algarvio
f06781c466
Merge pull request #13350 from s0undt3ch/hotfix/jenkins
...
unit test fixes
2014-06-10 16:44:04 +01:00
Erik Johnson
21488d0c14
Merge pull request #13359 from garethgreenaway/13293
...
Fix issue in aptpkg and yumpkg modules related to holding/unholding packages
2014-06-10 10:06:51 -05:00
Gareth J. Greenaway
62ef8513ee
fixing issue with yumpkg and aptpkg where pkgs was being zeroed out.
2014-06-10 07:47:04 -07:00
Joseph Hall
d7ed88debc
Merge pull request #13343 from gtmanfred/cloud_runner
...
Changes names to instances
2014-06-10 08:08:07 -06:00
Pedro Algarvio
b71780294c
Improve error message
2014-06-10 05:37:04 +01:00
Pedro Algarvio
9f7a52ecba
Raise an exception so the state knows what happened
2014-06-10 04:49:54 +01:00
Pedro Algarvio
f976f57122
No renaming is happening, return a boolean.
2014-06-10 03:53:52 +01:00
Thomas S Hatch
8ff91a92be
Don't expose OrderedDict to the loader
2014-06-09 20:41:58 -06:00
Nicole Thomas
2c68c00567
Merge pull request #3 from s0undt3ch/hotfix/cloud_tests_runtests
...
Add parser option to run cloud provider tests to runtests.py
2014-06-09 20:35:49 -06:00
Pedro Algarvio
0564fc363e
A more generic directory name
2014-06-10 03:25:14 +01:00
Pedro Algarvio
5a14e33ab3
Add parser option to run cloud provider tests to runtests.py
2014-06-10 03:17:41 +01:00
Thomas S Hatch
f57db73b3e
Merge pull request #13338 from cachedout/13295
...
Generate locales for Debian the Debian-way
2014-06-09 19:13:41 -07:00
Pedro Algarvio
5283fa661e
Adapt tests to behaviour introduced in #13333
2014-06-10 03:00:19 +01:00
Pedro Algarvio
d7bac143ac
Fix log message
2014-06-10 02:57:34 +01:00
Pedro Algarvio
0b6776ad81
Maintain old test behaviour(no new lines added)
2014-06-10 02:32:22 +01:00
Seth House
679f74198e
Added link target for the module sync system
2014-06-09 19:31:38 -06:00
Pedro Algarvio
df3e06ddd7
Test needs root perms
2014-06-10 01:56:24 +01:00
