Commit Graph

29682 Commits

Author SHA1 Message Date
Guillaume Derval
6141d67ebd Spaces instead of tabs 2014-04-26 15:01:12 +02:00
Guillaume Derval
30af5ee083 RHEL 7 should use systemd module 2014-04-26 14:26:51 +02:00
Thomas S Hatch
f85e77718a lint 2014-04-25 21:44:34 -06:00
Thomas S Hatch
b4cbe18093 Merge pull request #12313 from gtmanfred/rvm
Follow redirects for rvm installer
2014-04-25 21:37:36 -06:00
Thomas S Hatch
641d764924 Merge pull request #12311 from cro/lxc_runner
Make sure nic, nic_opts, cpuset, memory, cpu_share get passed in
2014-04-25 21:36:47 -06:00
Thomas S Hatch
d1760028cd Merge pull request #12305 from terminalmage/remove-redundant-arg
Remove redundant mkdirs argument
2014-04-25 21:32:17 -06:00
Thomas S Hatch
2d34ddde1f Merge pull request #12295 from whiteinge/doc-sls_id-versionadded
Added missing versionaddded to the new state.sls_id function
2014-04-25 21:19:58 -06:00
Thomas S Hatch
dab9c95b4d Merge pull request #12294 from whiteinge/file-replace-test-wording
Fix incorrect wording for file.replace when run with test=True
2014-04-25 21:19:41 -06:00
Thomas S Hatch
c5e984b7bf Merge pull request #12279 from eliasp/win-dns-prefix
Implemented win_dns_client.primary_suffix
2014-04-25 20:38:27 -06:00
Thomas S Hatch
6129ec828d Merge pull request #12281 from terminalmage/issue12209-tests
Add tests for #12209
2014-04-25 20:35:47 -06:00
Thomas S Hatch
0ac10d2fc6 Merge pull request #12290 from jacksontj/job_cache
Job cache
2014-04-25 20:34:16 -06:00
Thomas S Hatch
ff0cc318ba return the name of the created container 2014-04-25 18:08:06 -06:00
Thomas S Hatch
eb01f45b5e Add better tracking to multi deployment on the lxc runner 2014-04-25 18:06:35 -06:00
Daniel Wallace
c4e46317bd Follow redirects for rvm installer 2014-04-25 18:40:37 -05:00
Thomas Jackson
66d7110141 Cleanup some of the API in there 2014-04-25 16:26:44 -07:00
Thomas Jackson
41cf259b7e Cleanup 2014-04-25 16:26:44 -07:00
Thomas Jackson
8834b8f667 Don't load grains/functions for the master job cache 2014-04-25 16:26:44 -07:00
C. R. Oldham
2fb867f60a Make sure nic, nic_opts, cpuset, memory, cpu_share get passed into the lxc-create process 2014-04-25 17:03:48 -06:00
Thomas S Hatch
2e2a266622 update the init runner to take multiple container names 2014-04-25 17:02:13 -06:00
Erik Johnson
b78e558296 Remove unnecessary except 2014-04-25 18:00:04 -05:00
Erik Johnson
cb81b69abc Fix import 2014-04-25 17:58:41 -05:00
Colton Myers
9a03aa210e Merge pull request #12310 from terminalmage/quickfix
Tweak loglevel for dmidecode warning
2014-04-25 16:48:58 -06:00
Pedro Algarvio
1a65ee6bc7 In order not to change the arguments order 2014-04-25 23:34:15 +01:00
Erik Johnson
9f03a55b10 Tweak loglevel for dmidecode warning
In 18056a3 I changed the loglevel to WARNING, in my brain that was the
next *less* verbose loglevel, when in reality this should have been
changed to DEBUG.

Since the change, now all salt CLI commands show this warning since the
default CLI loglevel is warning. This is obviously not what I intended.

Also, this changes the warning about lspci to loglevel DEBUG.
2014-04-25 17:31:45 -05:00
Erik Johnson
bffb9b5d43 Add skipIf and destructiveTest
These tests must be run as root, and create and destroy a user and
group, so this adds the proper decorators.

Additionally, this wraps the assertions from these tests in a try/except
block that ensures that the temp directory created for this test is
cleaned up.
2014-04-25 17:17:34 -05:00
Erik Johnson
d9fa7c5203 Use new decorators for issue 12209 tests 2014-04-25 17:17:34 -05:00
Erik Johnson
8574d9a19e Use custom user/group for integration tests for #12209
Not all platforms have a "nobody" user, this commit changes these tests
to use a "test12209" user/group for these tests.
2014-04-25 17:17:34 -05:00
Erik Johnson
f73a193c6b Add tests for #12209 2014-04-25 17:17:33 -05:00
Pedro Algarvio
c93296e076 Merge pull request #12306 from terminalmage/version-fix
2014.1.2 -> 2014.1.3
2014-04-25 23:04:07 +01:00
Erik Johnson
d2fe475743 2014.1.2 -> 2014.1.3
2014.1.2 was not officially released, fix these RST directives.
2014-04-25 17:02:41 -05:00
Erik Johnson
3c284b1b6f Remove redundant mkdirs argument
This was obsoleted when we renamed makedirs() to makedirs_() and made a
func_alias for it. It does not exist in any officially released code, so
no need to deprecate it.
2014-04-25 16:47:08 -05:00
Pedro Algarvio
26179b90bd Merge pull request #12299 from terminalmage/update-decorator
Fix refs to with_system_account decorator
2014-04-25 22:05:36 +01:00
Thomas S Hatch
4fae3e2f14 lint 2014-04-25 15:03:07 -06:00
Thomas S Hatch
9e724172c9 Allow almost all lxc runner commands to hot many containers at once 2014-04-25 15:01:26 -06:00
Thomas S Hatch
b24bc5c994 introduce structure to execute over many hosts 2014-04-25 14:40:42 -06:00
C. R. Oldham
40dc67b86f Merge pull request #12298 from cro/lxc_docs_cp
LXC Salt-cloud driver docs cleanup.
2014-04-25 13:04:56 -06:00
Erik Johnson
ad53983a16 Fix refs to with_system_account decorator
This renames this decorator to with_system_user, to go along with
changes in https://github.com/saltstack/salt-testing/pull/14.
2014-04-25 14:03:41 -05:00
C. R. Oldham
b00d3de63f Link in some other docs, correct typos, clarify some LXC config parameters. 2014-04-25 13:00:21 -06:00
C. R. Oldham
e63bd3fcb8 Doc typos, minor corretion in docstring for set_pass 2014-04-25 12:59:53 -06:00
Seth House
03d25ed97c Added missing versionaddded to the new state.sls_id function 2014-04-25 10:32:21 -07:00
Seth House
9c976d57be Fix incorrect wording for file.replace when run with test=True 2014-04-25 10:23:48 -07:00
Colton Myers
3123b1a390 Merge pull request #12293 from basepi/cmdcreates12285
Fixed error in docs, `creates` is only available in Helium
2014-04-25 11:11:27 -06:00
Colton Myers
bfb16325a2 Fixed error in docs, creates is only available in Helium 2014-04-25 11:10:04 -06:00
Thomas S Hatch
4c280300a2 Now it is working! Only tested without the bootstrap script though 2014-04-25 10:56:48 -06:00
Thomas S Hatch
f4522b7aeb Merge pull request #12288 from s0undt3ch/hotfix/lxc-fixes
LXC tarball fixes
2014-04-25 09:39:59 -06:00
Pedro Algarvio
79214fabc6 Remove trailing white-space 2014-04-25 15:17:59 +01:00
Pedro Algarvio
4582f848d0 Don't rely on EUID 2014-04-25 15:06:40 +01:00
Pedro Algarvio
ce690cacbc Bash is not always available.
Let's stick with POSIX compliant shell
2014-04-25 15:05:14 +01:00
Pedro Algarvio
20c66fa1ad Add missing required space 2014-04-25 15:04:58 +01:00
Joseph Hall
d5023f431e Merge pull request #12287 from jslatts/s3_doc_typo
Fix doc typos about s3.verify_ssl flag
2014-04-25 07:07:18 -06:00