valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,324 Commits 24 Branches 182 Tags 341 MiB
741fd9d1ee
Commit Graph

81324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
0e087323f1 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-18 16:41:22 -06:00
Nathan Fish
a7d8f375e8 file.manage_file: uppercase checksums now work 
fixes #38914
 2017-04-18 18:10:31 -04:00
Mike Place
408699ac54 Merge pull request #40730 from ecdavis/boto_iam-delete-virtual-mfa-device 
Change boto_iam.user_absent state to delete IAM user's virtual MFA device after deactivation.
 2017-04-18 14:44:35 -06:00
Mike Place
421d7be152 Merge pull request #40731 from basepi/sync_fileservers 
Add fileserver syncing
 2017-04-18 14:19:15 -06:00
Mike Place
471a16cdc0 Merge pull request #40732 from basepi/config.get 
Add config runner (config.get for master settings)
 2017-04-18 14:12:34 -06:00
Mike Place
f4c9da2da0 Merge pull request #40733 from rallytime/fix-40435 
Change file data to bytes before attempting to hash
 2017-04-18 14:07:41 -06:00
Mike Place
3557b5140e Merge pull request #40735 from rallytime/handle-cloud-traces 
Handle stacktraces in cloud.action function in module and runner
 2017-04-18 14:05:06 -06:00
Mike Place
e700d8183b Merge pull request #40745 from cro/vmware_disk_datastore_bp 
Backport `Add support for specifying a datastore for new disks.` PR #36457
 2017-04-18 14:00:50 -06:00
Peter C. Norton
beecdc172d Fix camel-mis-case 2017-04-18 15:48:09 -04:00
Mike Place
78dbab01dc Merge pull request #40740 from cro/minion_delay_start 
Backport pr #39802 to add random_startup_delay
 2017-04-18 13:47:55 -06:00
Mike Place
6c8410e7be Merge pull request #40747 from markuskramerIgitt/variables_naming 
variable names more speaking
 2017-04-18 13:41:57 -06:00
Peter C. Norton
ba17b2865f Now I understand how this is supposed to work. 2017-04-18 15:39:21 -04:00
Nicole Thomas
ec32073e9d Merge pull request #40736 from ecdavis/boto_lambda-use-__utils__ 
Change boto_lambda module to use __utils__ instead of salt.utils to allow overriding modules
 2017-04-18 13:37:06 -06:00
Peter C. Norton
2ddb50399d Fix result creation 2017-04-18 14:54:38 -04:00
Evan Davis
8d634ef389 fix test failures 2017-04-18 11:02:27 -07:00
C. R. Oldham
1460f82ce4 Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:57:39 -06:00
C. R. Oldham
b26be652dd Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:56:09 -06:00
Dennis Dmitriev
98d149b44e Fix debug message in virt.init 2017-04-18 19:52:52 +03:00
C. R. Oldham
096f063464 Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:51:05 -06:00
Peter C. Norton
2c98592b0d Add calls for detailed monitoring 2017-04-18 12:46:22 -04:00
Nicole Thomas
d0b90058c4 Merge pull request #40706 from twangboy/fix_whitelist 
Remove non-existent tests from whitelist
 2017-04-18 10:30:55 -06:00
Dennis Dmitriev
63313ce58e Add possibility to specify multiple disks in 'virt' module 
Now disk profiles can contain multiple disks:

- backward compatible: if 'image' argument is set for virt.init()
  *and* 'image' attribute is missing for the first disk, then the
  first disk will use the 'image' from the method arguments

- multiple disks can be specified for a disk profile, see pillar
  example below

- if 'size' attribute set for qcow2-based image, then resulting
  image will be resized to the 'size' capacity (author: Ondrej Smola)

- empty disks allowed ('size' attribute is mandatory in this case)

Example disk profile 'three_disks':

virt:
  disk:
    three_disks:
      - system:
          size: 4096
          image: http://path/to/ubuntu.qcow2
      - repository_snapshot:
          size: 8192
          image: /var/lib/libvirt/images/snapshot.qcow2
      - cinder-volume:
          size: 16384
 2017-04-18 19:20:16 +03:00
C. R. Oldham
d24078d1a0 Add docs for "datastore" param for disks 2017-04-18 09:33:46 -06:00
C. R. Oldham
500d6b281d Document validity of a datastore key inside a disk definition. 2017-04-18 09:33:46 -06:00
C. R. Oldham
7608b10225 Add support for specifying a datastore for new disks. 2017-04-18 09:33:46 -06:00
Pablo Suárez Hernández
6abeeb88fb Prevents zero length error on Python 2.6 2017-04-18 16:13:20 +01:00
Pablo Suárez Hernández
47cb1e9495 Search the entire CACHE_DIR because storage paths change across versions 2017-04-18 16:04:14 +01:00
Clint Armstrong
72bf5af9e6 Set sfn if cached_sum == source_sum 2017-04-18 10:54:48 -04:00
Mike Place
2ab95b7dd5 Set minion test to use default opts 2017-04-18 08:34:57 -06:00
Mike Place
785e6060a9 Add requested docs 2017-04-18 08:34:56 -06:00
Mike Place
8ab321f934 A random startup delay option for minions 
This allows minions to spread out the load to the master if a large number
of them start up at once.
 2017-04-18 08:34:56 -06:00
Dmitry Kuzmenko
f9d2c4da8f Minor: unit test fix. 2017-04-18 11:56:20 +03:00
Dmitry Kuzmenko
f4c7db2930 Keep all return-related values in the job cache. 2017-04-18 11:56:20 +03:00
Evan Davis
2d6b62207e fix typo 2017-04-17 16:23:14 -07:00
Evan Davis
a1c8dacecc switch boto_lambda module from using salt.utils to __utils__ 2017-04-17 16:21:57 -07:00
Nicole Thomas
92c655b94d Merge pull request #40729 from ecdavis/boto_lambda-botocore-error-message 
Fix error message in boto_lambda module which incorrectly referenced boto_apigateway module.
 2017-04-17 16:46:14 -06:00
rallytime
87154a95a4 Use log.error instead of log.err 2017-04-17 16:29:03 -06:00
rallytime
b35bf919a3 Handle stacktraces in cloud.action function in module and runner 
Refs #29602
 2017-04-17 15:58:30 -06:00
Nicole Thomas
c712e916d2 Merge pull request #40722 from markuskramerIgitt/fix_typo 
fix typo
 2017-04-17 15:15:38 -06:00
Nicole Thomas
ea92c4fb4f Merge pull request #40725 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-17 15:13:40 -06:00
Nicole Thomas
a48ecc4a5c Merge pull request #40728 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-17 15:13:15 -06:00
Nicole Thomas
894dc96db3 Merge pull request #40727 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-17 15:12:47 -06:00
rallytime
ef09971b9e Change file data to bytes before attempting to hash 2017-04-17 15:01:51 -06:00
Colton Myers
8812341b70
Add sdb support, and also properly return the default 2017-04-17 14:57:46 -06:00
Colton Myers
8a9d4c7f4f
Add more cli examples 2017-04-17 14:47:11 -06:00
Colton Myers
5e8f92ef70
Add config.get runner function 2017-04-17 14:41:42 -06:00
Colton Myers
57e92f6fa5
Add fileserver syncing 2017-04-17 14:30:06 -06:00
twangboy
e4876abcde Add back the two loader tests 2017-04-17 14:04:20 -06:00
Evan Davis
1ace66bce7 when deactivating a user's mfa device, try to delete the virtual mfa devices with the same serial number 2017-04-17 12:58:48 -07:00
Evan Davis
ea488927a5 add delete_virtual_mfa_device function to boto_iam module to expose boto3 iam client's delete_virtual_mfa_device method 2017-04-17 12:57:43 -07:00