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
57,467 Commits 24 Branches 182 Tags 341 MiB
9f88f11ccd
Commit Graph

57467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Kuzmenko
2a88f90c71 Fix for Tornado HTTPClient file size and timeout limits issues. 2015-08-11 19:27:24 +03:00
Joseph Hall
176fa12d51 Move SPM to its own directory 2015-08-11 10:24:55 -06:00
Erik Johnson
8edc0d82c6 Merge pull request #26197 from TronPaul/gitfs-whitelist-base-fix 
Fix GitFS when whitelisting base
 2015-08-11 11:06:09 -05:00
Mike Place
ab4f8279c5 Merge pull request #26209 from rallytime/spacewalk_versionadded 
Correct versionadded tag for spacewalk runner
 2015-08-11 09:58:09 -06:00
rallytime
d75d22b8c4 Correct versionadded tag for spacewalk runner 2015-08-11 09:54:54 -06:00
Mike Place
3a495133f8 Merge pull request #26193 from rallytime/one-testing 
Add more unit tests to the OpenNebula driver
 2015-08-11 09:24:16 -06:00
rallytime
a3b673cfca Pylint fix 2015-08-11 09:23:28 -06:00
Mike Place
b996cf41b1 Merge pull request #26200 from alprs/fix-salt_cloud_current_user 
Make it possible to run salt-cloud as current user
 2015-08-11 09:01:44 -06:00
Mike Place
8f7077a83f Merge pull request #26022 from stardust85/issue-7179-correct 
Issue #7179 - implemented for yum-based systems
 2015-08-11 08:42:41 -06:00
Mike Place
82caf52497 Merge pull request #26201 from kev009/fbsd-disks-fix 
Avoid VBOX storage emulation bugs in FreeBSD disks grain
 2015-08-11 08:40:35 -06:00
Kevin Bowling
ded9f78ec0 Cache the VBOX check so we don't have to spawn another camcontrol for each disk 2015-08-11 01:50:19 -07:00
Kevin Bowling
2a24f8b768 Avoid VBOX storage emulation bugs in FreeBSD disks grain 2015-08-11 01:42:03 -07:00
Michel Samia
3c19ff89f8 #7179 modules: yumpkg.upgrade: make the API backwards compatible, document the positional arg pitfall 2015-08-11 01:22:39 -07:00
Andreas Lutro
0f985e9883 salt-cloud: None means run as current user 2015-08-11 09:33:23 +02:00
Justin Findlay
fd70187176 Merge pull request #26189 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-10 22:18:57 -06:00
Justin Findlay
7e58ee88dc Merge pull request #26188 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-10 22:17:59 -06:00
Mark McGuire
f3c1965785 Fix GitFS when whitelisting base 
- deconflate ref and env in every implementation of GitFS get_tree
 2015-08-10 22:47:30 -05:00
Mike Place
b72207f1c6 Merge pull request #26194 from basepi/fix.virt.grain.26121 
Allow virtual grains to be generated even if virt-what is not available
 2015-08-10 18:47:59 -06:00
Colton Myers
ed74766070 Allow virtual grains to be generated even if virt-what is not available 
Also normalized _cmds to be a list. The set() functionality wasn't
actually being used, we were just overwriting it with a list. Sets are
also unordered, which is a problem for a list of commands we want to run
in order.

Fixes #26121
 2015-08-10 17:17:59 -06:00
rallytime
14fe0b88af Add more unit tests to the OpenNebula driver 2015-08-10 17:15:38 -06:00
Colton Myers
ee4b788745 Skip tests that require windows libraries if not present 2015-08-10 16:57:06 -06:00
Colton Myers
49fb19049b Remove outdated heavily-mocked unit test 2015-08-10 16:54:17 -06:00
Mike Place
b57da552ff Merge pull request #26084 from twangboy/fix_25802 
Added python_shell=True, quoted user input
 2015-08-10 15:29:35 -06:00
Mike Place
653fed353a Merge pull request #26185 from nmadhok/clemson 
Adding ASAM, Spacewalk and Dynamic DNS runners
 2015-08-10 15:28:33 -06:00
Colton Myers
49cfd3d54e Remove out of date code 2015-08-10 15:24:55 -06:00
Colton Myers
cccad1fc27 py3 compat 2015-08-10 15:22:43 -06:00
Colton Myers
0667bfc0d5 Fix missing seconds variable 2015-08-10 15:21:24 -06:00
Mike Place
e4f265fcfc Merge pull request #8 from whiteinge/topfile 
Spelling and top-file-only aditions
 2015-08-10 15:04:07 -06:00
C. R. Oldham
78bc795a22 Merge pull request #26187 from dmyerscough/openldap-auth 
openldap authentication
 2015-08-10 14:30:48 -06:00
twangboy
4503ed5b34 Fixed but with multiple packages, was causing tests to fail 2015-08-10 13:36:53 -06:00
twangboy
f05e3e72a3 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25802 2015-08-10 13:36:02 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Colton Myers
aa19e20d43 Remove code that shouldn't have merged forward 2015-08-10 13:23:25 -06:00
Colton Myers
0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/__init__.py
    salt/cloud/clouds/vmware.py
    salt/loader.py
    salt/minion.py
    salt/modules/archive.py
    salt/modules/file.py
    salt/states/pkg.py
    salt/utils/http.py
 2015-08-10 13:21:57 -06:00
Mike Place
c3814137a3 Merge pull request #26183 from cro/anonldap2 
Fix LDAP configuration issue.
 2015-08-10 13:09:41 -06:00
Justin Findlay
3233ed4675 Merge pull request #26186 from jacobhammons/man-page-updates 
regenerated man pages
 2015-08-10 13:07:44 -06:00
Justin Findlay
4f4bbd5261 Merge pull request #26184 from loa/docker-py-auto-detect-version-dockerng 
Let docker-py auto detect version if not defined by user
 2015-08-10 13:03:03 -06:00
Justin Findlay
d48bcf7598 Merge pull request #26182 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-08-10 13:00:10 -06:00
Mike Place
f39780f8ce Merge pull request #26000 from driskell/fix_discarded_events 
Implement full event caching for subscribed tags
 2015-08-10 12:57:17 -06:00
C. R. Oldham
aa5e9c80b5 Lint roller 2015-08-10 12:53:23 -06:00
Nitin Madhok
5e69af183d Make these runners python3 compatible 2015-08-10 14:37:11 -04:00
Mike Place
c01b4cf150 Merge pull request #26175 from rallytime/bp-26153 
Back-port #26153 to 2015.5
 2015-08-10 12:22:32 -06:00
Mike Place
b76af36d38 Merge pull request #26176 from rallytime/bp-26165 
Back-port #26165 to 2015.8
 2015-08-10 12:22:20 -06:00
Mike Place
ca80f33bfd Merge pull request #26177 from rallytime/bp-26147 
Back-port #26147 to 2015.5
 2015-08-10 12:22:01 -06:00
Mike Place
1213b8d706 Merge pull request #26179 from rallytime/bp-25404 
Back-port #25404 to 2015.5
 2015-08-10 12:21:50 -06:00
Mike Place
b319c5ec04 Merge pull request #26180 from jfindlay/templ_env 
fix processing of state.template
 2015-08-10 12:21:38 -06:00
Nitin Madhok
5fc2468890 Lint fixes 2015-08-10 14:15:55 -04:00
Damian Myerscough
8957631c3d When querying openldap for user and what groups they're assigned 
to you need to parse the following response

[('uid=damian,ou=Users,dc=example,dc=com',
  {'memberOf': ['cn=engineering,ou=groups,dc=example,dc=com',
                'cn=linux,ou=Groups,dc=example,dc=com']})]

I used the following LDAP arguments:-

auth.ldap.server: 'ldaps://example.com'
auth.ldap.tls: True
auth.ldap.uri: 'ldaps://example.com'

auth.ldap.basedn: dc=example,dc=com
auth.ldap.binddn: uid={{ username }},ou=Users,dc=example,dc=com  # This causes the user to authenticate as themsevles to get the group details

auth.ldap.accountattributename: 'uid'
auth.ldap.groupattribute: 'memberOf'  # Get all the groups associated with the user

auth.ldap.groupou: 'Users'  # I query the users group and can get the list of groups associated with the user
auth.ldap.groupclass: 'person'
 2015-08-10 11:15:53 -07:00
Jacob Hammons
bf2dad913f regenerated man pages 2015-08-10 11:49:53 -06:00
Nitin Madhok
cc73fe619f Merge branch develop 2015-08-10 13:43:13 -04:00