valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
53,502 Commits 24 Branches 182 Tags 341 MiB
9dbafcc051
Commit Graph

53502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
d12f881c60 Merge pull request #23841 from favadi/gpg-rng-tools 
fix wrong package name for rng-tools
 2015-05-18 09:23:03 -06:00
Justin Findlay
a81f3521b3 Merge pull request #23838 from gtmanfred/develop 
add refresh_beacons and sync_beacons
 2015-05-18 09:22:20 -06:00
rallytime
5307d65ebb Merge #23773 with pylint fix 2015-05-18 09:20:37 -06:00
Thomas S Hatch
3257a9bead Merge pull request #23816 from Snergster/23685-doc-fix 
Doc for #23685 Added prereq, caution, and additional mask information
 2015-05-18 09:18:03 -06:00
Justin Findlay
6c2cdbfe7e Merge pull request #23836 from cedwards/ats_module 
improving function output and return code status in trafficserver
 2015-05-18 09:17:48 -06:00
Justin Findlay
41f315bbb3 Merge pull request #23834 from Arabus/develop 
Avoid deprecation warning from  portage.dep.strip_empty()
 2015-05-18 09:11:59 -06:00
Stephen Spencer
d22e9f74f0 Add cert_type argument to create_csr() and create_ca_signed_cert() 
. tls2.create_csr()
    new args:
        - cert_type (str) 'server' or 'client'
        - type_ext (bool) specifies whether to modify the output filename
          to reflect the cert_type

    augmented function docstring with wrt new options and the extensions
    added for each cert_type
 2015-05-18 10:06:38 -05:00
Justin Findlay
573791a8df Merge pull request #23813 from nmadhok/sphinx-patch 
Fixing Sphinx errors and warnings
 2015-05-18 09:06:32 -06:00
Nicolas Delaby
df48ac2b91 volumes path, on create, should be the one inside the container 
not from the host
 2015-05-18 14:30:44 +02:00
Jayesh Kariya
280abdec7c adding sysbench unit test case 2015-05-18 17:43:37 +05:30
pille
5d30d49ff0 beacon docs: fix YAML markup and typo 2015-05-18 13:50:27 +02:00
dumol
06bed050ae Updated for SLES 12. 
Added updated instructions for latest SLES release, using the relevant repo.
 2015-05-18 13:13:37 +03:00
Alkivi
c2a1eeb854 fix return 2015-05-18 11:56:15 +02:00
Alkivi
e4f5b61cea Add feature to match for key in dict pillar 
Based on this : https://github.com/saltstack/salt/issues/23775
 2015-05-18 11:50:24 +02:00
Nicolas Delaby
a8af238633 typo 2015-05-18 11:09:39 +02:00
Ronald van Zantvoort
9e2cf606eb Fix erroneous virtual:physical core grain detection 
DMIdecode output:

```
Handle 0x0100, DMI type 1, 27 bytes
System Information
        Manufacturer: Red Hat
        Product Name: KVM
        Version: RHEL 7.0.0 PC (i440FX + PIIX, 1996)
        Serial Number: Not Specified
        UUID: 863720D8-04A3-4046-85F4-89BA01C11728
        Wake-up Type: Power Switch
        SKU Number: Not Specified
        Family: Red Hat Enterprise Linux

Handle 0x0300, DMI type 3, 20 bytes
Chassis Information
        Manufacturer: Bochs
        Type: Other
        Lock: Not Present
        Version: Not Specified
        Serial Number: Not Specified
        Asset Tag: Not Specified
        Boot-up State: Safe
        Power Supply State: Safe
        Thermal State: Safe
        Security Status: Unknown
        OEM Information: 0x00000000
        Height: Unspecified
        Number Of Power Cords: Unspecified
```

Currently results in `virtual:physical`, which is obviously wrong.
 2015-05-18 10:35:38 +02:00
Diep Pham
70a77db23c fix wrong package name for rng-tools 2015-05-18 13:38:07 +07:00
Daniel Wallace
4405685443 add refresh_beacons and sync_beacons 
This allows them to be used in the gitfs too in /srv/salt/_beacons
 2015-05-17 23:26:48 -05:00
Jacob Hammons
46eb2655ee saltstack2 sphinx theme updates 2015-05-17 20:39:24 -06:00
Jacob Hammons
e7442d3b1e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-17 20:38:45 -06:00
Joseph Hall
3df3b85090 Merge pull request #23832 from ahus1/ahus1_saltify_bootstrap_2015.5 
make saltify provider use standard boostrap procedure
 2015-05-17 20:18:29 -06:00
Christer Edwards
7c620a2ad9 improving function output and return code status in trafficserver 2015-05-17 17:38:43 -06:00
Bernd May
86567214ae Proper replacement for portage.dep.strip_empty() with list comprehension, pep8fix 2015-05-17 22:48:10 +02:00
Bernd May
427e3fe896 Switch portage.dep.strip_empty(...) to filter(None,...) to avoid deprecation warning and do essentially the same 2015-05-17 21:57:36 +02:00
Alexander Schwartz
f5b1734782 fixing problem in unit test 2015-05-17 17:09:35 +00:00
Alexander Schwartz
cba47f6856 make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file 2015-05-17 18:16:43 +02:00
Joseph Hall
188f03f567 Merge pull request #23823 from gtmanfred/2014.7 
add link local for ipv6
 2015-05-17 06:48:25 -06:00
Mathieu Le Marec - Pasquet
d9a6464c0c more tls virtual fixes 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-17 13:27:10 +02:00
Mathieu Le Marec - Pasquet
c13ece69c5 fix tls virtual 
This fixes #23826

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-17 13:04:16 +02:00
Mathieu Le Marec - Pasquet
3fc4071a66 lint 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-17 12:47:42 +02:00
Mathieu Le Marec - Pasquet
59a124a64e use reinit_crypto everywhere 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-17 12:17:24 +02:00
Mathieu Le Marec - Pasquet
f103da4019 Fix PyCrypto routines at fork 
see https://lists.dlitz.net/pipermail/pycrypto/2013q4/000702.html

This fixes #23824

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-17 12:10:00 +02:00
Daniel Wallace
5ef006d59d add link local for ipv6 2015-05-17 01:17:58 -05:00
Nitin Madhok
63d8325833 Fixing more sphinx/docs errors and warnings 2015-05-16 19:38:13 -04:00
Nitin Madhok
12ea8f5c52 Fixing more sphinx/docs errors and warnings 2015-05-16 19:24:04 -04:00
Nitin Madhok
391a267c9c Fixing more sphinx/docs errors and warnings 2015-05-16 18:50:46 -04:00
Ed Kern
0fca49d52a Added prereq, caution, and additional mask information 2015-05-16 14:10:39 -07:00
Nitin Madhok
0189e06acc Fixing more sphinx/docs errors and warnings 2015-05-16 15:20:23 -04:00
Nitin Madhok
ac254a40ef Fixing more sphinx/docs errors and warnings 2015-05-16 15:15:06 -04:00
Nitin Madhok
09b645034a Fixing sphinx/docs errors and warnings 2015-05-16 14:55:54 -04:00
Justin Findlay
a2e23fd162 Merge pull request #23716 from makinacorpus/i23713 
Correct detect service toggling
 2015-05-16 11:00:44 -06:00
Niels Abspoel
3f65631cb6 updated suse spec file to version 2015.5.0 2015-05-16 10:57:46 -06:00
Kaithar
346f30bdda Log the error generated that causes returns.mysql.returner to except. 2015-05-16 10:52:44 -06:00
Z. Liu
fb32c32065 use abspath, do not eliminating symlinks 
realpath will eliminating symlinks, so following sls won't work as expected

/root/a:
  file.directory:
    - user: root
    - group: root
    - mode: 0755
    - clean: True
    - require:
      - file: /root/a/b

/root/a/b:
  file.symlink:
    - user: root
    - group: root
    - target: /etc
 2015-05-16 10:49:58 -06:00
rallytime
0616fb7884 Fix virtualport section of virt.get_nics loop 2015-05-16 10:46:33 -06:00
Mathieu Le Marec - Pasquet
61b7aad308 runners/lxc: optim 2015-05-16 17:15:44 +02:00
Mathieu Le Marec - Pasquet
e26885d8cb lint 2015-05-16 14:21:17 +02:00
Mathieu Le Marec - Pasquet
bde7867c98 service/{dead/running} optimizations & test fixes 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-16 13:33:34 +02:00
Justin Findlay
f3ca682f92 Merge pull request #23802 from gtmanfred/2014.7 
if it is ipv6 ip_to_int will fail
 2015-05-15 22:06:59 -06:00
Justin Findlay
8ec4fb2a73 Merge pull request #23791 from optix2000/psutil_compat 
Psutil compat
 2015-05-15 22:05:54 -06:00