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
58,932 Commits 24 Branches 182 Tags 341 MiB
7531bc7334
Commit Graph

58932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
d354885c3d Lint 2015-11-02 10:49:21 -07:00
C. R. Oldham
dbb1f0899e Lint 2015-11-02 10:48:33 -07:00
Mike Place
d19affd44d Merge pull request #28491 from rallytime/bp-28388 
Back-port #28388 to 2015.8
 2015-11-02 10:13:22 -07:00
Colton Myers
4bf56cad3f Merge pull request #28461 from cachedout/issue_28455 
Wrap all cache calls in state.sls in correct umask
 2015-11-02 10:11:02 -07:00
Mike Place
f7042ba967 Merge pull request #28465 from twangboy/fix_12363 
Fix #12363: Password Expiration in Windows
 2015-11-02 10:01:18 -07:00
Mike Place
ec0cbec00b Merge pull request #28485 from eyj/fix_28484 
Fix invalid usage of _get_conn causing #28484
 2015-11-02 09:47:52 -07:00
Seth House
e61ac75d6f Fix filter_by passing incorrect parameters to match functions 2015-11-02 09:32:29 -07:00
Christer Edwards
ffc77259c9 Updated FreeBSD installation docs: 
- fixed URL in description
 - set https in all URLs
 2015-11-02 11:31:23 -05:00
Mike Place
f740a19477 Working right now 2015-11-02 11:00:33 -05:00
Mike Place
700eaebad0 Disable starting to come to life 2015-11-02 11:00:33 -05:00
Mike Place
f8b17748ef More fixing 2015-11-02 11:00:33 -05:00
Mike Place
04585a2878 Documentation for disable_during_state_run 2015-11-02 11:00:33 -05:00
Mike Place
dbbd53689d Add documentation note in inotify beacon 2015-11-02 11:00:33 -05:00
Mike Place
40217fe813 More refactoring and add new option to disable during state run 2015-11-02 11:00:33 -05:00
Mike Place
19af5e5ed3 Starting on refactor of beacon config parsing 2015-11-02 11:00:33 -05:00
Mike Place
1116798f21 Merge pull request #28454 from sdm24/fix-formatting-in-nodegroup-docs 
Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config
 2015-11-02 08:14:40 -07:00
Mike Place
fac7803a59 Merge pull request #28487 from cachedout/lint_28456 
Lint 28456
 2015-11-02 07:52:27 -07:00
Mike Place
58fe15437a Lint #28456 2015-11-02 07:51:51 -07:00
Mike Place
22a4f14625 Merge pull request #28457 from sdm24/update-grain-ip-interfaces-comments 
Clarified comments for grains/core.py for ip_interfaces, ip4_interfac…
 2015-11-02 07:47:59 -07:00
Christophe Drevet-Droguet
8d26bbd777 grains module and state: documentation fixes 2015-11-02 09:31:45 -05:00
Christophe Drevet-Droguet
df7e936910 grains module and state: use a unique object... 
instead of a magic string to check the existence of a key/value
 2015-11-02 09:31:45 -05:00
Christophe Drevet-Droguet
df8ec1184c grains module documentation fixes 2015-11-02 09:31:45 -05:00
Christophe Drevet-Droguet
25e9a5c9ad grains state and module: fix version strings 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
eee2318873 grains state: allow deleting grain with 'False' value 
and destroy a grain previously set to None, with destructive=True:

The f46722aaeb commit, from Bruno Binet <bruno.binet@gmail.com> was
effectively reverted during my work on nested and complex values support.

This commit get it back, plus the ability to destroy a existing grain that
was previously set to None, plus tests for these.
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
c92326f5ea grains module: yaml representer for OrderedDict 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
2c9c8d4073 grains state doc update 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
576252da05 grains state: list_present, list_absent support nested grain 
... and custom delimiter
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
62a1f37d86 grains state: nested support for grains.append 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
3019a055c9 grains state: rewrite doc + example 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
c19cff517a grains state: more tests 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
cc844e4a2c grains state tests: test the grain file content as well 
It may be overkill, but I'm nervous about this change and
I don't want to mess with the grain file of a lot of people
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
1c5cd4c82d grains state: changes comment more accurate 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
563fd2b56c grains state: use DEFAULT_TARGET_DELIM 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
c63913e602 grains module: simpler comment for already set key 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
2000180791 grains.present uses grains.set 2015-11-02 09:31:43 -05:00
Christophe Drevet-Droguet
a03c79b13b module grains.set default comment is a string 2015-11-02 09:31:43 -05:00
Christophe Drevet-Droguet
64e9e2c3b3 grains.absent uses set(None) 
- support nested grains
- conservative about removing complex values (dict or list)
 2015-11-02 09:31:43 -05:00
Christophe Drevet-Droguet
6b8c245b87 grains state: new tests for nested grains 2015-11-02 09:31:43 -05:00
Mike Place
5818b28c85 Merge pull request #28473 from alprs/feature-cmd_check_output 
Show check_cmd output on failure
 2015-11-02 07:15:30 -07:00
Nasenbaer
9d80fb6070 Fix invalid usage of _get_conn causing #28484 2015-11-02 14:56:58 +01:00
Andreas Lutro
a772ce330a fix tests 2015-11-02 10:50:51 +01:00
Andreas Lutro
90b01e9e0d show check_cmd output on failure 2015-11-01 14:53:12 +01:00
Daniel Wallace
8b90ccedf5 overwrite more than one value with names 
```
dockerfiles:
  file.managed:
    - makedirs: True
    - template: jinja
    - names:
      - /builds/archlinux/Dockerfile:
        - source: salt://builds/files/archlinux
      - /builds/deb/Dockerfile:
        - source: salt://builds/files/deb
      - /builds/rpm7/Dockerfile:
        - source: salt://builds/files/rpm
        - context:
            version: centos7
      - /builds/rpm6/Dockerfile:
        - source: salt://builds/files/rpm
        - context:
            version: centos6
      - /builds/rpm5/Dockerfile:
        - source: salt://builds/files/rpm
        - context:
            version: centos5
```

Without this change, salt will only grab the first entry from the list before
this change.  This allows for overwritting and having more variables for
similar files.
 2015-10-31 23:08:19 -05:00
Justin Findlay
cfe39df7ac Merge pull request #28460 from jtand/wipe_fs_fix 
Skipped wipefs test if wipefs does not exist on OS
 2015-10-30 22:09:32 -06:00
twangboy
bcf7d58dbb Fixed array if there's a problem with user.info 2015-10-30 16:49:00 -06:00
twangboy
4b36cb8b6e Added documentation to win_shadow 
Added ability to get the date the password was changed in win_useradd
 2015-10-30 16:44:36 -06:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
 2015-10-30 16:05:26 -06:00
twangboy
fc8f197f69 Fix #12363 
Added additional functions to win_shadow for parity with linux
Added additional parameters to win_useradd for win_shadow
- ability to set an account expiration date
- ability to expire an account immediately
- ability to disable a user account
- ability to unlock a user account
- ability to set the password to never expire
- ability to disallow the user to change the password
 2015-10-30 15:31:49 -06:00
Mike Place
097838ec0c Wrap all cache calls in state.sls in correct umask 
Refs #28455
 2015-10-30 15:05:36 -06:00
justinta89
7ca79f1f7b Skipped wipefs test if wipefs does not exist on OS 2015-10-30 15:04:33 -06:00