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,903 Commits 24 Branches 182 Tags 341 MiB
c79d81bea1
Commit Graph

57903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
c79d81bea1 initial static_modules support 2015-08-22 10:41:58 -06:00
Justin Findlay
82b2633dc7 Merge pull request #26589 from hatchery/develop 
Give MacOS an 'os_family' grain
 2015-08-22 10:00:26 -06:00
Thomas S Hatch
0faa375d31 Merge pull request #26586 from gtmanfred/develop 
reinit crypto like in #23825
 2015-08-22 09:45:58 -06:00
David J. Felix
bf44ac1257 Give MacOS an 'os_family' grain 
- MacOS seemed to be the only OS without an os_family named.
- Formulas based on os_family for cross platform were unnecessarily difficult because of this.
 2015-08-22 10:19:16 -04:00
Daniel Wallace
57e25c1940 reinit crypto like in #23825 
Without this, salt-cloud fails when running using cloud.profile in a
reactor. so does runnerclient.cmd('cloud.profile').
 2015-08-22 04:46:00 -05:00
Justin Findlay
a030caec75 Merge pull request #26554 from tjstansell/fix_thin_scp 
/bin/sh is more portable than /bin/bash
 2015-08-21 11:41:35 -06:00
Colton Myers
7202510ae2 Merge pull request #26556 from rallytime/one-toctree 
Add Getting Started with OpenNebula docs to Cloud Provider Specifics
 2015-08-21 11:00:02 -06:00
rallytime
f8c927f8b7 Add Getting Started with OpenNebula docs to Cloud Provider Specifics 2015-08-21 10:17:51 -06:00
Todd Stansell
3b5f7852bf /bin/sh is more portable than /bin/bash 2015-08-21 09:13:07 -07:00
Mike Place
f0e1f3c966 Merge pull request #26532 from jodv/fix_24354 
use same master eval logic for Minion and SMinion
 2015-08-21 09:59:05 -06:00
Nicole Thomas
3d95aad2a5 Merge pull request #26283 from nmadhok/vmware-cloud-tests-develop 
Additional unit tests for VMware cloud driver
 2015-08-21 08:57:39 -06:00
Justin Findlay
fced99ec88 Merge pull request #26548 from vakulich/develop 
Catch OSError during cache directories creation, fixes #19249
 2015-08-21 08:23:23 -06:00
Justin Findlay
cb42d3c0e4 Merge pull request #26547 from nmadhok/patch-1 
Correcting spelling of digital in doc/topics/releases/2015.5.4.rst
 2015-08-21 08:18:32 -06:00
Justin Findlay
27800ceb58 Merge pull request #26545 from nmadhok/vmware-key-error-patch-develop 
Do not raise KeyError when calling avail_images if VM/template is in disconnected state
 2015-08-21 08:17:44 -06:00
Justin Findlay
5064f11c1c Merge pull request #26542 from arthurlogilab/patch-12 
[doc] reactor documentation fix : returners
 2015-08-21 08:14:34 -06:00
Justin Findlay
4703ac3028 Merge pull request #26535 from bobrik/ipset-ranges 
Properly check for ipset ranges, fixes #26453
 2015-08-21 08:13:01 -06:00
Vasili Akulich
fabe4e2300 Catch OSError during cache directories creation, fixes #19249 2015-08-21 16:01:13 +03:00
Nitin Madhok
ed343aee6e Correcting spelling of digital 2015-08-21 07:24:17 -04:00
Nitin Madhok
5a0c01eaf0 Do not raise KeyError when calling avail_images if VM/template is in disconnected state 2015-08-21 07:07:35 -04:00
Nitin Madhok
b2a1ec25e7 Lint fix 2015-08-21 06:46:41 -04:00
Nitin Madhok
df85bf351b Skip the unit tests that need pyVmomi installed if it is not present 2015-08-21 06:20:18 -04:00
Arthur Lutz
337b466b11 [doc] reactor documentation fix : returners 2015-08-21 11:45:39 +02:00
Ivan Babrou
5b82c45746 Properly check for ipset ranges, fixes #26453 
This add support for idempotent runs of `ipset.present` state
if ranges are used as entries. IP1-IP2 and IP/MASK variants
are supported.
 2015-08-21 09:18:54 +01:00
Justin Findlay
1757e980d8 Merge pull request #26539 from carlpett/patch-1 
Doc-fix: Escape backslash in domain\username
 2015-08-21 01:19:41 -06:00
Calle Pettersson
fd39928389 Doc-fix: Escape backslash in domain\username 
The unescaped backslash in "mydomain\username" makes it appear like "mydomainusername", slightly confusing the documentation.
 2015-08-21 08:22:28 +02:00
Justin Findlay
aea76abdd5 Merge pull request #26524 from JensRantil/issue-18652 
Gracefully handle package comparison not in (-1, 0, 1)
 2015-08-20 23:42:50 -06:00
Justin Findlay
e7ebfd05b9 Merge pull request #26512 from trananhkma/develop 
fix raven
 2015-08-20 23:35:30 -06:00
Trần Tuấn Anh
c71a1ea491 remove raven.load() 2015-08-21 10:54:57 +07:00
Trần Tuấn Anh
af3ebd7e53 pep8 2015-08-21 09:23:34 +07:00
Trần Tuấn Anh
37d3d7eb99 options fix 2015-08-21 09:19:14 +07:00
Trần Tuấn Anh
ea3908debd handled options 2015-08-21 09:12:23 +07:00
Justin Findlay
51065b834f Merge pull request #26511 from rasathus/support-nested-upstart 
Adds support for nested upstart scripts in the form of subfolder/serv…
 2015-08-20 17:18:17 -06:00
Jeremy Rosenbaum
9efbf4e5d4 Fix lint errors 
Running the `MinionBase` init method with `super` is literally the same as the
`self.opts = opts` statement that was in the init method for `SMinion` anyway
so if it makes flake8 happy, then sure.
 2015-08-20 14:52:14 -07:00
Jeremy Rosenbaum
0eaccab724 use same master eval logic for Minion and SMinion 
This fixes https://github.com/saltstack/salt/issues/24354
There was inconsistent behavior between salt-minion (`Minion` under the hood)
and salt-call (`SMinion` under the hood) with regard to how the master was
determined from the minion config.  `SMinion` had its own hard-coded master
evaluation in its `__init__` method that was not congruent with documentation.
The "standard" master evaluation logic existed in `master_eval`, a method of
`Minion`.
This was resolved by moving `master_eval` into `MinionBase` (which `Minion`
inherits from) and making `SMinion` also subclass `MinionBase`, which
otherwise only consists of a couple of methods that `SMinion` won't access.
 2015-08-20 13:41:59 -07:00
Jens Rantil
86f1b14dc3 logging(cmp_version): output assertion 
Log error. The integer comparison is Python 3 compatible and ripped from
[1]. This will catch incorrectly implemented version comparison
functions.

[1] http://stackoverflow.com/a/3646519/260805
 2015-08-20 19:38:50 +02:00
Jens Rantil
db79c0e861 utils(version_cmp): handle comparison not in (0,1,-1) 
See [1]. It fixes it.

[1] https://github.com/saltstack/salt/issues/18652#issuecomment-133073612
 2015-08-20 19:38:50 +02:00
Jeremy Rosenbaum
d8cc71dbd8 fix some docstring typos 2015-08-20 10:35:20 -07:00
Trần Tuấn Anh
30c9923d38 fix E1321 2015-08-20 23:52:10 +07:00
Colton Myers
c390e812d8 Merge pull request #26435 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-20 10:05:53 -06:00
Justin Findlay
6fd1ed8c42 Merge pull request #26508 from jodv/public_hash_function 
Make arbitrary hash function access public
 2015-08-20 09:53:44 -06:00
Trần Tuấn Anh
c555ef7de9 add urlparse 2015-08-20 22:44:49 +07:00
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
Trần Tuấn Anh
d005321e85 add comment 2015-08-20 19:42:53 +07:00
Trần Tuấn Anh
4045c70d84 fix raven's version bug 2015-08-20 18:04:39 +07:00
Chris Fane
e00a98fd37 Adds support for nested upstart scripts in the form of subfolder/service. This is implemented via an os.walk through the /etc/init folder, rather than the previous glob for *.conf method. 
Fixes #26478 - nested upstart services are not supported
 2015-08-20 10:59:20 +01:00
Jeremy Rosenbaum
7a04a8dc1e Make arbitrary hash function access public 
While the normal splay functionality to spread job execution times across minions
uses the minion ID as the hash function key, I've found other use cases where I
want access to a consistent hashing algorithm in execution modules but I don't
necessarily want the minion ID to be the key.  This is just a minor change to
allow public access to the previously hidden function that allows that.
 2015-08-19 23:59:56 -07: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