valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,581 Commits 24 Branches 182 Tags 341 MiB
44fbd49b33
Commit Graph

57581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
44fbd49b33 Merge pull request #26503 from nmadhok/vmware-hardware-version-develop 
VMware cloud driver - Adding ability to specify the virtual hardware version when creating VM
 2015-08-20 08:35:46 -06:00
Nitin Madhok
702b55f2ca Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:05:12 -04:00
Mike Place
0cf9f11aa5 Merge pull request #26458 from arthurlogilab/minion_proxy_fixes 
[minionproxy] example modules fixes
 2015-08-19 16:49:49 -06:00
Mike Place
97aea928c4 Merge pull request #26466 from s0undt3ch/hotfix/py3-FileNotFoundError-exception 
Py3 compatibility. Address KeyError.
 2015-08-19 16:48:32 -06:00
Nicole Thomas
3b0c01d2c9 Merge pull request #26468 from TheBigBear/patch-11 
Suggested rewording to satisfy issue #26403
 2015-08-19 16:46:15 -06:00
TheBigBear
85c29a437b Suggested uopdate to satisfy issue #26403 
closes and fixes https://github.com/saltstack/salt/issues/26403
 2015-08-19 16:37:46 +01:00
Pedro Algarvio
92685904fc Replace open() with salt.utils.fopen() 2015-08-19 16:26:27 +01:00
Pedro Algarvio
2c5bce356a Py3 compatibility. Address KeyError. 
In cases where the grains aren't being loaded by a master or a minion, `file_buffer_size` is not present in the options and a `KeyError` is raised. Properly address those cases.
Under Py3, `open()` returns bytes. Adapt the logic to take that into account.
 2015-08-19 16:21:07 +01:00
Nicole Thomas
f77491a34d Merge pull request #26457 from arthurlogilab/patch-11 
docstring improvement for network.ping module execution
 2015-08-19 08:18:14 -06:00
Nicole Thomas
485ab4497f Merge pull request #26455 from arthurlogilab/patch-9 
[doc] topology / proxyminions fix  typos
 2015-08-19 08:17:49 -06:00
Nicole Thomas
65e6283d3a Merge pull request #26456 from arthurlogilab/patch-10 
docstring improvement for ProxyMinion
 2015-08-19 08:17:31 -06:00
Arthur Lutz
873ffdaeff [minionproxy] example modules fixes 2015-08-19 14:27:44 +02:00
Arthur Lutz
c104e6e36d docstring improvement for network.ping module execution 2015-08-19 14:05:30 +02:00
Arthur Lutz
16f940438e docstring improvement for ProxyMinion 2015-08-19 14:04:29 +02:00
Arthur Lutz
9800bcfa3e [doc] topology / proxyminions fix typos 2015-08-19 14:03:14 +02:00
Justin Findlay
a6f4c216db Merge pull request #26447 from shift/feature/fix_slack_returner_docs 
[Docs] Corrected code blocks.
 2015-08-18 15:30:12 -06:00
Vincent Palmer
d99a496324 Corrected code blocks. 2015-08-18 22:59:56 +02:00
Mike Place
ff7852f67b Merge pull request #26421 from alxbse/nova-floating-ip 
Add initial support for floating IP in nova cloud driver.
 2015-08-18 14:29:59 -06:00
Mike Place
d08839f0ed Merge pull request #26437 from s0undt3ch/hotfix/py3-FileNotFoundError-exception 
On Python 3 `os.stat()` might raise FileNotFoundError.
 2015-08-18 14:24:13 -06:00
Pedro Algarvio
fa00a9c412 On Python 3 os.stat() might raise FileNotFoundError. 
FileNotFoundError is apparently a subclass of OSError but it wasn't
getting caught in Python 3. Adding IOError made it work.
 2015-08-18 18:17:06 +01:00
Alexander Backlund
0cfe63776a Added versionadded info to new functions 2015-08-18 11:46:12 -04:00
Mike Place
97e14922cf Merge pull request #26416 from yesimon/root_path_plist 
Add /usr/local/bin to $PATH in salt-minion plist
 2015-08-18 08:29:24 -06:00
Mike Place
4cfbc04f75 Merge pull request #26250 from DSRCompany/http_client_issues 
Moved timeout and max body settings to minion config.
 2015-08-18 08:28:31 -06:00
Mike Place
44a9c7fab9 Merge pull request #26417 from scottjpack/patch-1 
Changed t1 -> t2 micro
 2015-08-18 08:13:33 -06:00
Alexander Backlund
e4d07a6922 Fix formatting 2015-08-18 07:28:28 -04:00
Dmitry Kuzmenko
3e701238b8 Fixed slack unit test 2015-08-18 14:02:49 +03:00
Alexander Backlund
ba08e1edc0 Add initial support for floating IP in nova cloud driver. 
Add requisite functions for floating IP to utils/openstack/nova

Fixes saltstack/salt#26370
 2015-08-18 06:58:47 -04:00
Dmitry Kuzmenko
d7dd0e2865 Use default values if not in opts 2015-08-18 13:55:17 +03:00
Dmitry Kuzmenko
5e33eff8d1 Moved timeout and max body settings to minion config. 2015-08-18 13:55:17 +03:00
Colton Myers
f55336ac42 Merge pull request #26412 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-18 00:38:28 -06:00
scottjpack
ee898d082a Changed t1 -> t2 micro 
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
 2015-08-17 21:31:14 -06:00
Simon Ye
2ab5ee90b3 Add /usr/local/bin to $PATH in salt-minion plist 2015-08-17 22:41:25 -04:00
Colton Myers
65a29e60d6 Merge pull request #26390 from zircote/feature/add-tags-to-sentry-log-handler 
Provides tagging of Sentry LogHandler events.
 2015-08-17 17:20:48 -06:00
Colton Myers
f3c8ba85dc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/modules/systemd.py
    salt/utils/aws.py
 2015-08-17 17:06:59 -06:00
Robert Allen
b7627dae0e Provides tagging of Sentry LogHandler events. 
By providing context within the logging events it becomes more effective
in multiple environments as well as addition details such as os, custom
grains, etc. This primarly shadow the functionality in the sentry
shipper with the exception of explicit introduction of the salt.loader
includes to enable the feature.
 2015-08-17 17:18:37 -05:00
Mike Place
b3335d627f Merge pull request #26400 from rallytime/bp-26318 
Back-port #26318 to 2015.8
 2015-08-17 15:17:50 -06:00
Mike Place
a16a506ce6 Merge pull request #26397 from s0undt3ch/2015.8 
A single `isinstance()` check for all types is enough
 2015-08-17 14:45:17 -06:00
Mike Place
8abb1f682c Merge pull request #26385 from gtmanfred/2015.8 
don't require volume endpoint in nova driver
 2015-08-17 14:41:03 -06:00
Mike Place
682e12ab7d Merge pull request #26399 from s0undt3ch/hotfix/log-handlers-loader-improvements 
Make `__grains__` and `__salt__` available for log_handler modules
 2015-08-17 14:36:30 -06:00
Mike Place
f2b26a6b49 Merge pull request #26394 from codehotter/register-image 
add register_image function
 2015-08-17 14:35:56 -06:00
Mike Place
7b9158f1dc Merge pull request #26395 from terminalmage/fix-faq 
Fix wording of windows minion restart in FAQ
 2015-08-17 14:35:19 -06:00
C. R. Oldham
ac25a84aa2 Merge pull request #26287 from techhat/spmloaders 
Break out SPM components into loaders
 2015-08-17 14:33:40 -06:00
rallytime
2c8032887f Added versionadded directive for new masked funciton. 2015-08-17 14:01:16 -06:00
Evgeny Vereshchagin
ab4d6e5323 Fix service.enable for masked services 2015-08-17 14:00:20 -06:00
Shane Lee
665ddb3e75 Merge pull request #26384 from TheBigBear/patch-7 
Fix shell quoting for cmd.run
 2015-08-17 13:49:39 -06:00
Justin Findlay
ac8c6a2bf1 Merge pull request #26391 from rallytime/bp-26367 
Back-port #26367 to 2015.8
 2015-08-17 13:39:41 -06:00
Pedro Algarvio
54ad6532f2 Make __grains__ and __salt__ available for log_handler modules 
Refs #26390
 2015-08-17 20:29:25 +01:00
Daniel Wallace
9c3d85f0fd fixing extra variables 2015-08-17 14:28:40 -05:00
Emanuel Rietveld
4382e290e0 add register_image function 2015-08-17 21:25:35 +02:00
Mike Place
740e7aa82f Merge pull request #26355 from gtmanfred/batch 
add batch to orchestrate runner
 2015-08-17 13:22:11 -06:00