valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
29,708 Commits 24 Branches 182 Tags 341 MiB
18d969a674
Commit Graph

29708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
18d969a674 Adapt the test to the changes made in 3c284b1b6. 2014-04-27 12:35:07 +01:00
Pedro Algarvio
9337a4e7fc Merge pull request #12330 from s0undt3ch/develop 
Bootstrap Script Updates
 2014-04-27 11:48:47 +01:00
Pedro Algarvio
23b12283fb Update the bootstrap script tutorial doc to latest from the project. 
Also ignore the bootstrap script HTTPS URL.
 2014-04-27 11:48:17 +01:00
Pedro Algarvio
a99bb566b9 Use the proper HTTPS URL for the bootstrap script. 
Closes #12328
 2014-04-27 11:48:17 +01:00
Pedro Algarvio
b288ccdbb0 Merge pull request #12332 from s0undt3ch/hotfix/jenkins 
Revert "Default to https instead of http"
 2014-04-27 11:47:33 +01:00
Pedro Algarvio
a1d446d1e5 Revert "Default to https instead of http" 
This reverts commit 6fc260be9e.
 2014-04-27 11:46:36 +01:00
Pedro Algarvio
37ebffff7c Merge pull request #12328 from gtmanfred/https 
Default to https instead of http
 2014-04-27 11:45:08 +01:00
Pedro Algarvio
faa4184c6c Merge pull request #12331 from s0undt3ch/hotfix/proper-bootstrap-script-name 
proper bootstrap script name
 2014-04-27 11:41:49 +01:00
Pedro Algarvio
76c9aba4ef Call the right script name. 
Fixes #12320.
Closes #12321.
 2014-04-27 11:41:34 +01:00
Thomas S Hatch
3301b1c468 expose _chroot_exec as run_chroot under cmd exec module 2014-04-26 23:39:28 -06:00
Daniel Wallace
6fc260be9e Default to https instead of http 
For everything that doesn't use python urllib
 2014-04-26 20:20:32 -05:00
Erik Johnson
9c43e634b6 Merge pull request #12318 from borgstrom/develop 
PEP8/PEP20: use kwargs.get instead of one line if/else
 2014-04-26 14:40:52 -05:00
Thomas S Hatch
1d3a733d84 Fix networking in lxc 2014-04-26 11:41:12 -06:00
Thomas S Hatch
d81c25acf9 minior style fix 2014-04-26 11:41:12 -06:00
Thomas S Hatch
f6829a881e Merge pull request #12316 from GuillaumeDerval/develop 
RHEL 7 should use the systemd module
 2014-04-26 11:01:27 -06:00
Pedro Algarvio
1f270b7e4b Merge pull request #12319 from bechtoldt/doc_typo 
fix tiny typo in docstring ssh execution module
 2014-04-26 16:00:01 +01:00
Arnold Bechtoldt
61a1542582 fix tiny typo in docstring ssh execution module 2014-04-26 16:16:56 +02:00
Evan Borgstrom
bbe38a627d PEP8/PEP20: use kwargs.get instead of one line if/else 
I was poking around in the transport code thinking about an idea and
noticed this simplification.
 2014-04-26 09:53:33 -04:00
Joseph Hall
7b05da5df6 Merge pull request #12291 from skrobul/openstack-keyring 
Support storing provider passwords in a keyring instead of plain-text
 2014-04-26 07:32:18 -06:00
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
Marek Skrobacki
43739fef14 remove leftover comment 2014-04-26 10:40:01 +01:00
Marek Skrobacki
524113fc4f fix pylint warnings 2014-04-26 10:21:26 +01: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