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
56,335 Commits 24 Branches 182 Tags 341 MiB
30e6a812de
Commit Graph

56335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorge Schrauwen
30e6a812de Merge branch 'imgadm-output-cleanup' of https://github.com/sjorge/salt into imgadm-output-cleanup 2015-08-09 12:32:17 +00:00
Jorge Schrauwen
96e7a19b96 salt.modules.smartos_imgadm - renamed import_image to import, now inline with underlaying imgadm update. Also returns proper output. 2015-08-09 12:31:53 +00:00
Jorge Schrauwen
26ea39e07f salt.modules.smartos_imgadm - parse output for get 2015-08-09 12:15:08 +00:00
Jorge Schrauwen
e8e802f0f5 salt.modules.smartos_imgadm - parse output for get 2015-08-09 11:36:18 +00:00
Jorge Schrauwen
1ccafa50d9 salt.modules.smartos_imgadm - parse output for show 2015-08-09 11:28:54 +00:00
Jorge Schrauwen
c13ba6afce salt.modules.smartos_imgadm - renamed list_installed to list, now inline with underlaying imgadm update. Also returns proper output. 2015-08-09 11:18:20 +00:00
Jorge Schrauwen
fad9908550 salt.modules.smartos_imgadm - avail now gives proper output 2015-08-09 11:04:23 +00:00
Jorge Schrauwen
1a1b2d7fc1 salt.modules.smartos_imgadm - renamed update_installed to update and added optional uuid parameter, now inline with underlaying imgadm update 2015-08-09 09:40:53 +00:00
Jorge Schrauwen
ebb6909287 minor doc fix for salt.modules.smartos_imgadm 2015-08-09 09:17:59 +00:00
Jorge Schrauwen
e70c885a22 salt.modules.vacuum now takes a parameter verbose. 2015-08-09 09:08:48 +00:00
Jorge Schrauwen
17acf8e622 salt.module.smartos_imgadm now supports vacuum 2015-08-09 08:12:44 +00:00
C. R. Oldham
cb6764a551 Merge pull request #26128 from sjorge/imgadm-avail-multi 
imgadm.avail should return multiple results
 2015-08-08 15:58:46 -06:00
Jorge Schrauwen
2680b35f17 imgadm.avail should return multiple results 2015-08-08 12:39:02 +00:00
Justin Findlay
4dce1b4dc0 Merge pull request #26109 from jfindlay/quote 
fix quote indent
 2015-08-07 13:52:44 -06:00
Justin Findlay
59cf0ceb39 fix quote indent 2015-08-07 13:52:08 -06:00
Mike Place
98cd21ad4e Merge pull request #26089 from alprs/fix-user_gecos_None 
User state/module: fix coercing of None into string "None" in GECOS
 2015-08-07 08:43:50 -06:00
Mike Place
f906dfe7a5 Merge pull request #26081 from cachedout/move_invacation_up 
Move invocation routine up
 2015-08-07 08:36:49 -06:00
Mike Place
63960779de Lint 2015-08-07 08:36:32 -06:00
Mike Place
114fbf2ea4 Merge pull request #26086 from rallytime/bp-26019 
Back-port #26019 to 2015.8
 2015-08-07 08:27:54 -06:00
Mike Place
b9edd1b537 Merge pull request #26087 from rallytime/bp-26059 
Back-port #26059 to 2015.8
 2015-08-07 08:27:43 -06:00
Andreas Lutro
ceda2b7274 users: integration test for empty GECOS fields 2015-08-07 09:25:21 +02:00
Andreas Lutro
36d7b2018f users: fix coercing of None into string in gecos 2015-08-07 08:48:27 +02:00
Nicole Thomas
b57adef8fc Merge pull request #26052 from jtand/rh_ip_fix 
Rh_ip fix
 2015-08-06 17:34:59 -06:00
Jeremy Rosenbaum
3381082d1c fix pylint error (unnecessary 'finally' clause may swallow exceptions unintentionally) 2015-08-06 17:30:32 -06:00
Jeremy Rosenbaum
0b2efdb049 Fix issue with mixed user and group eauth perms 
If an eauth config contained permissions for specific users and for groups,
a valid user that did not belong to any of the groups specified would have requests
fail because the validation logic assumed that if groups were configured for eauth,
any valid token would contain groups info, but the token creation logic only inserted
this information if the user matched one or more groups specified in the eauth config.

I also cleaned up a bunch of logic that fetched the same dictionary data repeatedly
and cycled through the same data multiple times.
 2015-08-06 17:30:32 -06:00
Jeremy Rosenbaum
e5d7be5e40 Return all relevant perms on login 
If the requesting user was in a group specified in the eauth config, then the return would only have
the permissions allowed by their group memberships, even if there were specific permissions for that user
or permissions for '*'.  A user without any group permissions, but with user-specific permissions would also
not get permissions for '*'.  Now, the return should contain all relevant permissions for the requesting user.
 2015-08-06 17:30:32 -06:00
Evgeny Vereshchagin
366ca02b22 Fetch a keyid ID from a fingerprint 
`apt-key del` works with IDs
`signing_key_fingerprint` contains a fingerprint
 2015-08-06 17:28:03 -06:00
Mike Place
a66f3eb8f1 Merge pull request #26078 from cachedout/issue_26040 
Fix missing key in error return
 2015-08-06 16:45:13 -06:00
justinta89
aaede4a7a1 removed osmajorrelease key 2015-08-06 16:00:39 -06:00
Colton Myers
cb7b13e37b Merge pull request #26074 from basepi/revert.revert.25358 
[2015.8] Re-apply #25358 in 2015.8
 2015-08-06 15:49:58 -06:00
Mike Place
aeee91cd77 Move invocation routine up 2015-08-06 15:42:07 -06:00
Mike Place
b3a6253b2c Fix missing key in error return 
Closes #26040
 2015-08-06 15:17:54 -06:00
Domingo Kiser
1ff67c3c22 Deep merge of pillar lists 2015-08-06 14:10:21 -06:00
Mike Place
8f2e542b2b Merge pull request #26069 from jfindlay/win_fire 
fix win_firewall.delete_rule
 2015-08-06 12:49:28 -06:00
Justin Findlay
4ad8cabef4 fix win_firewall.delete_rule 2015-08-06 11:21:05 -06:00
Justin Findlay
cdc9886e9d Merge pull request #26066 from s0undt3ch/hotfix/bootstrap-script-2015.8 
[2015.8] Update to latest bootstrap stable release v2015.06.08
 2015-08-06 11:10:28 -06:00
Justin Findlay
3361c073a2 Merge pull request #26049 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-06 10:59:13 -06:00
Pedro Algarvio
76c77eef33 Update to latest bootstrap stable release v2015.06.08 
* Fix python-requests installations for Ubuntu >= 14.04 LTS. saltstack/salt-bootstrap#631, saltstack/salt-bootstrap#632, saltstack/salt-bootstrap#633
* Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04
* Exit the git checkout directory before deleting it. Thanks Bret Fisher. saltstack/salt-bootstrap#634
* Use prefix /usr for centos git install. Thanks Stanislav B. saltstack/salt-bootstrap#638
* Drop Ubuntu EOL versions. All Ubuntu version before 12.04.
* Make sure python-dev is installed wheb trying to install tornado from PyPi. saltstack/salt-bootstrap#640
 2015-08-06 14:54:14 +01:00
justinta89
941910bdca Fixed a ValueError in rh_ip.py 2015-08-05 15:35:44 -06:00
Colton Myers
a4d4f8c5f8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/modules/layman.py
    salt/modules/win_system.py
 2015-08-05 15:30:04 -06:00
Justin Findlay
fde2fb1386 Merge pull request #26026 from alprs/fix-httpasswd_test_result 
Fix httpasswd result false positive in test mode
 2015-08-05 13:54:07 -06:00
Thomas S Hatch
dedcadc37e Merge pull request #26044 from rallytime/fix-25616 
Make sure the key we're comparing is also lowercase
 2015-08-05 13:23:54 -06:00
Thomas S Hatch
f005bdfce6 Merge pull request #26042 from jfindlay/result 
fix test mode logic in state docs
 2015-08-05 13:23:06 -06:00
Thomas S Hatch
0ce62bafe5 Merge pull request #26037 from rallytime/bp-25489 
Back-port #25489 to 2015.8
 2015-08-05 13:22:50 -06:00
Thomas S Hatch
51ab6864b7 Merge pull request #26036 from nicholascapo/survey.hash_follow_out_flag 
survey.hash: Remove manually printed text
 2015-08-05 13:21:58 -06:00
rallytime
c2e3803810 Make sure the key we're comparing is also lowercase 
Fixes #25616
 2015-08-05 11:57:06 -06:00
Justin Findlay
a83059ca01 fix test mode logic in state docs 2015-08-05 11:29:56 -06:00
Dmitry Kuzmenko
68aad3bd97 Fixed lin error 2015-08-05 10:56:28 -06:00
Dmitry Kuzmenko
041da28fc4 Fix lint error 2015-08-05 10:56:27 -06:00
Dmitry Kuzmenko
190de6aa4d Added NotImplemented Satl Exception. 2015-08-05 10:56:27 -06:00