valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,429 Commits 24 Branches 182 Tags 341 MiB
702b55f2ca
Commit Graph

57429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Carl Loa Odin
a9eea45d89 Let docker-py auto detect version if not defined by user 
Docker-py will auto detect docker version incase version 'auto' is used.
Reference: docker/docker-py#673
 2015-08-10 19:35:16 +02:00
C. R. Oldham
79833e3f8a Cherry pick index.rst change. 2015-08-10 10:59:16 -06:00
C. R. Oldham
99f2c27399 Documentation update for anonymous bind issue. 2015-08-10 10:58:29 -06:00
C. R. Oldham
793eed7b96 Cherry pick master.py groups check 2015-08-10 10:58:05 -06:00
Colton Myers
32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    conf/minion
    doc/conf.py
    salt/modules/file.py
 2015-08-10 10:56:40 -06:00
Justin Findlay
5e46ea4441 check type of matches in render_state before iterating 
Fixes #26112.
 2015-08-10 10:50:07 -06:00
Justin Findlay
c80299b918 insert saltenv to render_state args in state.template 2015-08-10 10:50:07 -06:00
Dmitry Kuzmenko
52ab9fc1fb Fixed minion failover to next master on DNS errors. 2015-08-10 10:49:22 -06:00
Nicole Thomas
336bc3ce66 Merge pull request #26147 from martinhoefling/develop 
Fixes #26024
 2015-08-10 10:44:58 -06:00
Martin Hoefling
323c3ab53c Fixes #26024 2015-08-10 10:44:44 -06:00
Mike Place
abdf2935c4 Merge pull request #26116 from corux/fix-escape-content 
file.replace fails if repl string is an invalid regex and append/prepend is used
 2015-08-10 10:44:12 -06:00
Nicole Thomas
ef5a4a47f6 Merge pull request #26172 from nmadhok/backport-cloud-fix-26163-2015.5 
[Backport] Make sure variable is a dictionary before popping something from it.
 2015-08-10 10:42:50 -06:00
Nitin Madhok
a51c4ac945 image argument not mandatory for vmware cloud driver. Fixes #26164 2015-08-10 10:35:33 -06:00
Mike Place
a547eaf672 Merge pull request #26169 from terminalmage/issue26149 
Fix attribute error in gitfs' find_file functions
 2015-08-10 10:34:12 -06:00
Carl Loa Odin
9a263067e9 Fix dockerio state documentation typo 2015-08-10 10:34:06 -06:00
Nicole Thomas
151acabdca Merge pull request #26170 from nmadhok/backport-cloud-fix-26163-2015.8 
[Backport] Make sure variable is a dictionary before popping something from it.
 2015-08-10 10:25:03 -06:00
Nicole Thomas
f019214245 Merge pull request #26163 from nmadhok/cloud-fix-26162 
Make sure variable is a dictionary before popping something from it.
 2015-08-10 10:24:19 -06:00
Nicole Thomas
d0ef023d72 Merge pull request #26165 from nmadhok/cloud-fix-26164 
clonefrom argument should be mandatory instead of image argument for vmware cloud driver.
 2015-08-10 10:22:43 -06:00
Nicole Thomas
ee2f4d5b3f Merge pull request #26144 from nmadhok/vmware-cloud-fixes-develop 
VMware cloud driver fixes [forward port from 2015.5 into develop]
 2015-08-10 10:18:31 -06:00
Nicole Thomas
22705c5222 Merge pull request #26143 from nmadhok/vmware-cloud-fixes-2015.8 
VMware cloud driver fixes [forward port from 2015.5 into 2015.8]
 2015-08-10 10:17:59 -06:00
Nicole Thomas
883bd060f7 Merge pull request #26173 from jacobhammons/cloud-driver-docs 
Updates to cloud docs for the provider > driver change
 2015-08-10 10:15:44 -06:00
Mike Place
79ce2880f7 Merge pull request #26160 from silenius/issue26155 
proposed fix for #26155
 2015-08-10 10:12:39 -06:00
Jacob Hammons
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs. 
Refs #24797
 2015-08-10 09:20:26 -06:00
Nitin Madhok
0f2b5f8ac8 Make sure variable is a dictionary before popping something from it. 2015-08-10 11:14:18 -04:00
Erik Johnson
2bef1db9f5 Fix attribute error in gitfs' find_file functions 
Resolves #26149, thanks very much to @TronPaul for the investigative
work here.
 2015-08-10 10:07:55 -05:00
Nitin Madhok
cd4faace82 Make sure variable is a dictionary before popping something from it. 2015-08-10 11:06:34 -04:00
Mike Place
2545df052a Merge pull request #26168 from cachedout/fix_slack_docs 
Fix slack docs
 2015-08-10 08:57:18 -06:00
Mike Place
f421a936dc Fix slack docs 
Closes #26098
 2015-08-10 08:56:42 -06:00
Mike Place
c02adba640 Merge pull request #26138 from evverx/tz-fix 
Check the tzname before the tzfiles hashsums
 2015-08-10 08:47:29 -06:00
Mike Place
f68d612344 Merge pull request #26154 from loa/docker-py-auto-detect-version 
Let docker-py auto detect version if not defined by user
 2015-08-10 08:44:52 -06:00
Mike Place
2704094e21 Merge pull request #26125 from evverx/timedatectl-settz 
Use timedatectl set-timezone to tzsetting if available
 2015-08-10 08:43:41 -06:00
Mike Place
9e6b0d6165 Merge pull request #26127 from garethgreenaway/2015_5_24106 
Fixes to salt.utils.http related to cp.get_file_str bug.
 2015-08-10 08:38:25 -06:00
Mike Place
3e79f6e79d Merge pull request #26167 from cachedout/lint_26157 
Lint #26157
 2015-08-10 08:35:55 -06:00
Mike Place
a39eaa265a Lint #26157 2015-08-10 08:35:20 -06:00
Mike Place
eaa759c2f5 Merge pull request #26157 from bradthurber/module_hashutil_docs_missing_escape_char 
hashutil python docs are missing escape chars and some lines are too …
 2015-08-10 08:34:40 -06:00
Mike Place
5eda47aa84 Merge pull request #26145 from sjorge/imgadm-output-cleanup 
smartos_imgadm cleanup
 2015-08-10 08:32:21 -06:00
Mike Place
95a560ebf1 Merge pull request #26148 from terminalmage/winrepo 
Refactor winrepo support
 2015-08-10 08:31:25 -06:00
Justin Findlay
bf59d7a648 Merge pull request #26153 from loa/fix-dockerio-documentation-typo 
Fix dockerio state documentation typo
 2015-08-10 08:26:51 -06:00