Commit Graph

31917 Commits

Author SHA1 Message Date
Mathieu Le Marec - Pasquet
e6af7cde9d Fix systctl parsing on no space separator 2014-06-11 20:36:52 +02:00
Pedro Algarvio
593f86df51 Merge pull request #13390 from rallytime/cloud_docs
Added expensiveTest documentation to cloud testing docs
2014-06-11 19:32:27 +01:00
Pedro Algarvio
f316a8242f Merge pull request #13392 from rallytime/rackspace_cloud_tests
Rackspace with openstack driver cloud tests
2014-06-11 19:31:05 +01:00
Pedro Algarvio
0a4f3053a0 Merge pull request #13393 from rallytime/cloud_test_cleanup
Code clean-up and remove shadowing
2014-06-11 19:29:38 +01:00
rallytime
87bf98a0db Code clean-up and remove shadowing 2014-06-11 11:42:00 -06:00
Colton Myers
097cc08af9 Merge pull request #13376 from cachedout/10423
More descriptive logging for token failures
2014-06-11 11:36:20 -06:00
rallytime
28b8900b9b Added expensiveTest decorator 2014-06-11 11:35:34 -06:00
rallytime
dd03b59dc6 Rackspace with openstack driver cloud tests 2014-06-11 11:26:30 -06:00
rallytime
cd91d4c9cc Added expensiveTest documentation to cloud testing docs 2014-06-11 11:17:27 -06:00
pengyao
f808fc141a If interface type is slave, not auto set hwaddr
If auto set hwaddr for bond, it will use the true hwaddr for the first time. It's correct.
But interfaces will display same hwaddr in a bond by use 'ifconfig' or 'ip link show' when bond running,
Then they will reset to same hwaddr when execute state again, os will prompt like:

    Bringing up interface bond0:  Device eth2 has different MAC address than expected, ignoring.
                                                           [  OK  ]

eth2 interface in this example will eliminate from bond0. It's incorrect.
2014-06-11 23:38:08 +08:00
Sebastien Estienne
69ba4e8ba7 Document the keep parameter of archive.extracted state 2014-06-11 17:28:28 +02:00
pengyao
c7c5e8e981 Only Debian famiry systems need saltenv
Only Debian systems(modules/aptpkg.py) need saltenv for mod_repo function.
If not differentiate it, RedHat famiry systems will add saltenv option to the repo file.
2014-06-11 22:50:53 +08:00
Audrius Kucinskas
29868d1829 fixed commments 2014-06-11 12:35:24 +03:00
Thomas Jackson
1541adb46f Cache the sreq inside the zmqchannel instead of caching the entire channel object.
This is an improvement over #10332 in that you don't have to worry about someone creating a ZeroMQChannel then forking (thereby breaking the thread-pid rules). This way once it moves it will create a new sreq as needed.

This is possible now that #13155 is merged
2014-06-10 19:38:56 -07: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
derrick.birkes
ce07b0e75d A deep copy should be used for default options.
Use deep copy to get default master and minion options to avoid altering
them.

This fixes an issue encountered when defining grains for multiple nodes in a salt-cloud map file.
Nodes deployed later in the process were getting grains for previously deployed nodes.
2014-06-10 15:22:55 -06:00
Mike Place
36fa800821 Switch to arg parser.
Resolves #13294
2014-06-10 14:46:07 -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