Commit Graph

70247 Commits

Author SHA1 Message Date
Daniel Hobley
7834aeda7d Fix a bug when creating a new VM and changing the network info
- This commit fixes a small bug where the network adapter won't be connected at startup of the VM and therefore can never be contacted by the salt master, the fix is to just simply apply the same config changes once the clone is completed
2016-06-02 09:18:31 +02:00
remy.d1
6e576d8111 rename find_no... to find_non... 2016-06-02 09:15:36 +02:00
remy.d1
4e5e05342e Merge branch 'develop' of https://github.com/saltstack/salt into custom-net-ps-modules 2016-06-02 09:14:35 +02:00
Morrie Winnett
29964a50ee Add modules to utilize PowerShell PKI 2016-06-02 00:11:57 -07:00
Clayton Burlison
b483d1d8a6 Update mac native package for upcoming release
This solves an issue where the package `resources` and package `scripts` were being added to the root of the install drive.

Change Spelling for:
* xCode to XCode
* and capitalize Command Line Tools

to match Apple's offical documentation.

Ref: https://developer.apple.com/xcode/
and https://developer.apple.com/library/ios/technotes/tn2339/_index.html
2016-06-01 23:32:23 -05:00
eric vz
1e7e953442 remove unneeded warning log 2016-06-01 21:04:08 -05:00
eric vz
f0aa35a367 Fix version numbers for added/changed 2016-06-01 20:39:39 -05:00
Thayne Harbaugh
15b831cf24 Ensure that all usage errors exit with status EX_USAGE 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
0f8757b70d Propogate the process.exitcode - otherwise process always exits with EX_OK 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
1fdb232af3 Test that correct salt-minion start-up exits with EX_OK 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
920f062193 Test that an unknown argument to salt-minion exits with EX_USAGE 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
b5e66ad853 Test that a non-existent user for salt-minion exits with EX_NOUSER
Add common exit status assert function.
2016-06-01 18:21:49 -06:00
Thayne Harbaugh
11a9e1e839 Various improvements to the TestProgram classes:
* Add debug logging when a program is started
  * Set a flag once a TestDaemon has been shutdown(); check flag in is_running()
  * Add .config_path property
  * salt.utils.process.clean_proc() only works with multiprocessing - replace it
  * Automatically add --config-dir for TestSaltDaemon if it isn't already specified
2016-06-01 18:21:49 -06:00
Thayne Harbaugh
33048c75b5 It's silly to use a python module path when the function is in the file. 2016-06-01 17:24:23 -06:00
twangboy
6c7b21676a Fix lint and tests 2016-06-01 17:10:55 -06:00
twangboy
4775e6bdf0 Add additional params to state 2016-06-01 17:10:55 -06:00
twangboy
b0af32346d Add additional params to install and remove 2016-06-01 17:10:55 -06:00
Joseph Hall
84fdb252f7 Py3 fix 2016-06-01 16:58:48 -06:00
Justin Anderson
210aceb402 Refactored tests to not use return messages 2016-06-01 16:57:37 -06:00
Erik Johnson
9da40c4437 Append empty dictionaries for saltenvs with no top file
Rather than excluding them from the get_tops() return data at all, just
populate them with empty dictionaries. This makes it easier to unit test
things like merge order, while still being functionally the same as
exlcluding the saltenv from get_tops() altogether.
2016-06-01 17:31:29 -05:00
Mike Place
c8dc70b96a Merge pull request #33685 from jfindlay/get_url_test
modules.cp.get_url: add test for https://
2016-06-01 15:25:41 -07:00
Mike Place
5e022ff29c Merge pull request #33581 from dincamihai/2015.8
Call zypper refresh after adding/modifying a repository
2016-06-01 15:25:11 -07:00
Mike Place
c725854596 Merge pull request #33680 from rallytime/bp-32942
Back-port #32942 to 2016.3
2016-06-01 15:14:19 -07:00
Ross Vandegrift
08d9dafd5c During minion verification, read directly from public key file
By avoiding temp file on every minion verification, I/O load can be
reduced considerably.
2016-06-01 17:51:07 -04:00
Justin Anderson
9d437bd45d Removed artifact from testing 2016-06-01 15:32:41 -06:00
Justin Anderson
134e1fa888 Fixed typos, and added destructiveTest decorator 2016-06-01 15:25:18 -06:00
Justin Anderson
37bc3ad8fd Fixed typo, uninstalled to uninstall 2016-06-01 15:16:15 -06:00
Mike Place
069ee15b7c Merge pull request #33681 from rallytime/bp-33599
Back-port #33599 to 2015.8
2016-06-01 14:14:29 -07:00
Mike Place
13537c4891 Merge pull request #33396 from babilen/issue-33393
Issue 33393
2016-06-01 14:12:03 -07:00
Justin Findlay
2b5035fdc0 modules.cp.get_url: add test for https:// 2016-06-01 15:10:12 -06:00
Justin Anderson
5b23b91ac6 Integration test for gem module 2016-06-01 15:09:55 -06:00
Mike Place
178feef40f Merge pull request #33660 from hrumph/develop
Addition of only_on_pending_reboot param to reboot and shutdown functs + other minor fixes
2016-06-01 14:04:55 -07:00
Mike Place
4123298538 Merge pull request #33657 from jeanpralo/dockerng-get-default-docker-auth
use default docker auth file as prior auth system
2016-06-01 14:02:10 -07:00
Mike Place
05d2951246 Merge pull request #33601 from mchugh19/slack-fix
Fix slack engine to run on python2.6
2016-06-01 13:48:19 -07:00
rallytime
e68097445c Revert "Track down more unicode instances and add a test"
This reverts commit 9729aed262.

This isn't the right approach here. This fix needs to be more narrow.
2016-06-01 16:44:05 -04:00
Dan Slimmon
ef885c1b7e Added test mode to dockerng.volume_present. Resolves #33632. 2016-06-01 20:39:56 +00:00
Jean Praloran
90dfe751b3 fix lint problem 2016-06-02 08:39:55 +12:00
Jean Praloran
81239c6a93 fix error catching when reading the file 2016-06-02 08:39:55 +12:00
Jean Praloran
a39b4861a4 use default docker auth file as prior auth system 2016-06-02 08:39:54 +12:00
Mike Place
64ba252256 Merge pull request #33650 from terminalmage/issue29954
Feature: add per-saltenv configuration parameter support
2016-06-01 13:34:30 -07:00
Mike Place
9571dad678 Merge pull request #33677 from twangboy/fix_runas
Pass kwargs to cmd.run
2016-06-01 13:20:08 -07:00
Ethan Moore
45143a599b use requests streaming for uploads/downloads to file (return_bin unchanged)
allows downloading files larger than amount of memory (non-stream reads into memory before writing to disk or uploading)
2016-06-01 16:10:26 -04:00
Ethan Moore
4a9b23f03f first go at having requests use streaming for get/put requests 2016-06-01 16:07:49 -04:00
onorua
09751ecb04 Make tornado raise error configurable (#32942) 2016-06-01 15:53:25 -04:00
Ferry Schuller
238c53b6cc Removed unused import salt.utils.jid. 2016-06-01 21:43:13 +02:00
Mike Place
d5ff1bc21e Merge pull request #33663 from ksvasan/develop
Fix the unlock bug with zk_concurrency module
2016-06-01 11:59:03 -07:00
Joseph Hall
a3f1983c3b Add missing import 2016-06-01 12:24:32 -06:00
Joseph Hall
3db2258237 Increase lun count for each device 2016-06-01 12:24:32 -06:00
Joseph Hall
6d344e8b2d Allow attaching data disks to VM during creation 2016-06-01 12:24:32 -06:00
Erik Johnson
5eb1b3ca62 Only compile the template contents if they evaluate to True
When getting all the top files for the various environments, those
environments without a top file will return ``False`` when we attempt to
cache the file. Passing a boolean to ``compile_template()`` will result
in an error being logged, since we are invoking the function incorrectly
(it expects the template data to be a string).

Since a ``False`` return from caching the file means that it does not
exist, this commit will only run ``compile_template()`` when the
contents evaluate to ``True``.

Resolves #33424.
2016-06-01 13:24:31 -05:00