valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,573 Commits 24 Branches 182 Tags 341 MiB
1ea426e299
Commit Graph

49573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
1ea426e299 Move code to properly handle default requirements. 
Refs #26305
 2015-08-17 19:48:00 +01:00
Pedro Algarvio
8fda8c0db3 M2CryptoWin{32,64} should only be installed on Salt < 2015.8.0 2015-08-17 19:48:00 +01:00
Pedro Algarvio
0ff2f19aee Override the develop command in cmdclass 2015-08-17 19:47:59 +01:00
Pedro Algarvio
a5aa752a85 Override the develop command when WITH_SETUPTOOLS is set 2015-08-17 19:47:59 +01:00
Pedro Algarvio
4d6841c761 Install M2CryptoWin{32,64} while installing Salt 2015-08-17 19:47:59 +01:00
Mike Place
709499438b Merge pull request #26386 from jahamn/fix-autosign_timeout 
Fixes autosign_timeout usage in check_autosign_dir
 2015-08-17 12:34:40 -06:00
David Boucha
8d901d7b15 Merge pull request #26328 from twangboy/fix_25562 
Removed salt-master role requirement
 2015-08-17 12:30:17 -06:00
Mike Place
74558f5743 Merge pull request #26362 from garethgreenaway/2015_5_26327_more_invisible_mount_options 
Fixes to mount state.
 2015-08-17 11:44:55 -06:00
Nicole Thomas
7dbbd90c98 Merge pull request #26379 from s0undt3ch/issues/backport-26353 
[2015.5] Backport #26353
 2015-08-17 11:19:28 -06:00
Jason Hamner
b2fa2ac9d3 Fixes autosign_timeout usage in check_autosign_dir 
Fixes #24334
 2015-08-17 11:00:25 -06:00
Loren Carvalho
33ed315c85 fixed Packaing -> Packaging typo and added a couple comments on the setuptools/distutils abstract methods 2015-08-17 15:33:51 +01:00
Gareth J. Greenaway
cf532d46dd Some mount options are translated to different options once a share has been mounted, eg. when specifying a protocol for NFS as either tcp or udp this option is translated into either proto=tcp or proto=udp. Change adds a lookup dictionary for these options so that a re-mount isn't forced each time. 2015-08-16 08:15:05 -07:00
C. R. Oldham
bcca1b4c5a Merge pull request #26277 from rallytime/fix-26240 
Handle exception when user is not found in keystone.user_get
 2015-08-14 13:41:59 -06:00
C. R. Oldham
78be3a826f Merge pull request #26326 from rallytime/create_snapshot_return 
Make ec2.create_snapshot return less unweildly and more relevant
 2015-08-14 13:40:47 -06:00
Justin Findlay
44c9d3063b Merge pull request #26306 from rallytime/fix-16179 
Move VM creation details dict to log.trace
 2015-08-14 11:39:52 -06:00
twangboy
d4ca1dccbf Removed salt-master role requirement 2015-08-14 10:52:45 -06:00
rallytime
c5395db851 Make ec2.create_snapshot return less unweildly and more relevant 2015-08-14 09:57:53 -06:00
rallytime
670464258f Move VM creation details dict to log.trace 
Fixes #16179
 2015-08-13 16:44:10 -06:00
Justin Findlay
1e3f33a03c autogenerated 2015.5.4 release notes 2015-08-13 14:32:17 -06:00
Justin Findlay
0a5d1307c4 Merge pull request #26292 from jquast/backport-ubuntu-rabbitmq-fix 
Rabbitmq 3.2.4 on Ubuntu has "...done.", not "...done"
 2015-08-13 13:53:29 -06:00
Justin Findlay
21cc3c3bf6 Merge pull request #26296 from jquast/bugfix-runas-rabbitmqctl-2015.5 
bugfix missing `runas=None' for rabbitmqctl cmds (backport to 2015.5)
 2015-08-13 13:52:40 -06:00
Justin Findlay
ee59d154d7 Merge pull request #26293 from jfindlay/reggie 
Fix #26268
 2015-08-13 13:48:06 -06:00
Mike Place
5dd5ac1198 Merge pull request #26290 from rallytime/fix-25192 
Only call convert_to_arn when action name is provided
 2015-08-13 12:48:58 -06:00
Justin Findlay
c81dc0b62f Merge pull request #26288 from bbinet/grains-absent-fix 
allow to delete grains which value is False
 2015-08-13 12:24:36 -06:00
Justin Findlay
91ea964556 add versionadded to reg exec and state mods 2015-08-13 12:13:02 -06:00
Justin Findlay
3348b726c9 fix state/reg unit tests 2015-08-13 12:13:02 -06:00
Jeff Quast
eb77320786 bugfix missing `runas=None' for rabbitmqctl cmds 
Problem
=======

Some rabbitmqctl client commands were executed without
honoring the ``runas`` state keyword, resulting in
system commands executed as the minion. States that
previously succeeded are now failed by parser error
traceback when failing to split by expected tabstops
output, wheras the output likely contains some error.

Solution
========

Forward the ``runas=None`` keyword parameter in the
standard pattern for supplementary functions that
were introduced by cd0212e8e, ``_check_perms_changes``
and ``_check_tags_changes``.

All calls to ``__salt__['rabbtimq.(...)']`` were
audited, no further bugs of this pattern found.

Example Symptom
===============

```
Failure: rabbitmq_user_|-rabbitmq-user-xxx_|-xxx_|-present: An exception occurred in this state: Traceback (most recent call last):
    File "/usr/lib/python2.7/site-packages/salt/state.py", line 1561, in call
      **cdata['kwargs'])
    File "/usr/lib/python2.7/site-packages/salt/states/rabbitmq_user.py", line 147, in present
      if _check_tags_changes(name, tags):
    File "/usr/lib/python2.7/site-packages/salt/states/rabbitmq_user.py", line 70, in _check_tags_changes
      return __salt__['rabbitmq.list_users']()[name] - set(newtags)
    File "/usr/lib/python2.7/site-packages/salt/modules/rabbitmq.py", line 116, in list_users
      return _output_to_dict(res, func)
    File "/usr/lib/python2.7/site-packages/salt/modules/rabbitmq.py", line 94, in _output_to_dict
      key, values = row.split('\t', 1)
  ValueError: need more than 1 value to unpack
```
 2015-08-13 10:50:04 -07:00
Justin Findlay
3f74a389ce return test results when test=True 2015-08-13 11:05:11 -06:00
Geraint Jones
39ef653bc2 Rabbitmq 3.2.4 on Ubuntu has ...done. not ...done, change the if to be more portable 2015-08-13 10:00:47 -07:00
rallytime
a1f90fa070 Only call convert_to_arn when action name is provided 
Refs #25192
 2015-08-13 10:57:14 -06:00
rallytime
0b6977335e Clean it up 2015-08-13 10:42:20 -06:00
rallytime
5edabfd271 It's a dict - git problems... 2015-08-13 10:40:53 -06:00
rallytime
39d3eb66f0 Log error and return error - make returns consistent. 2015-08-13 10:39:03 -06:00
Mike Place
65ab5aa495 Merge pull request #26263 from rallytime/fix-24882 
Don't make changes when test=True for openstack present/absent funcs
 2015-08-13 10:30:31 -06:00
Mike Place
3d1a9cfedd Merge pull request #26265 from rallytime/fix-24484 
Don't stacktrace on query return in ec2.create_snapshot
 2015-08-13 10:28:48 -06:00
Mike Place
5778cb3f01 Merge pull request #26285 from stanislavb/2015.5 
Remove explicit version from instance identity URL
 2015-08-13 10:25:32 -06:00
Bruno Binet
f46722aaeb allow to delete grains which value is False 2015-08-13 18:22:21 +02:00
Mike Place
679dc089c0 Merge pull request #26275 from cachedout/mm_reinit 
Re-init modules on multi-master reconnect
 2015-08-13 09:52:50 -06:00
Nicole Thomas
75fff28779 Merge pull request #26273 from garethgreenaway/2015_5_schedule_list_show_jobs_enabled 
Fixes to schedule module in 2015.5
 2015-08-13 09:34:42 -06:00
Stanislav Blokhin
1f18f4f91e Remove explicit version from instance identity URL 2015-08-13 14:53:24 +02:00
Joseph Hall
10af22775a Merge pull request #26271 from rallytime/fix-24483 
Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2
 2015-08-12 17:22:47 -06:00
twangboy
a1274c438d I might have fixed some tests... I might have made them worse 2015-08-12 17:13:50 -06:00
rallytime
496474d862 Handle exception when user is not found in keystone.get_user 
Refs #26240
 2015-08-12 16:54:42 -06:00
Mike Place
1e0473c04a Re-init modules on multi-master reconnect 2015-08-12 16:08:23 -06:00
twangboy
7393adf5a8 Fixed some lint 2015-08-12 16:00:36 -06:00
Gareth J. Greenaway
1aad4b1b4f Jobs are enabled by default but schedule.list does not show an enabled jobs as being enabled by default. This change fixes that. 2015-08-12 14:19:05 -07:00
rallytime
139fbb93bc Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2 
Fixes #24483
 2015-08-12 14:57:07 -06:00
rallytime
86b8161d22 Mock test key in __opts__ dict 2015-08-12 14:29:33 -06:00
twangboy
787c88a283 Multiple improvements to reg executionmod and state mod 2015-08-12 14:14:42 -06:00
rallytime
4975300591 Don't stacktrace on query return in ec2.create_snapshot 
Fixes #24484
 2015-08-12 13:15:02 -06:00