Commit Graph

58813 Commits

Author SHA1 Message Date
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
Sam Michel
eb92afe238 Clarified comments for grains/core.py for ip_interfaces, ip4_interfaces, and ip6_interfaces,
to explicitly state that the ips for each interface are passed as a list

See #24775
2015-10-30 13:17:25 -07:00
Sam Michel
322a28bb06 updated states.virtualenv_mod comments to reflect that some kwargs need 'distribute: True'
see #26011
2015-10-30 13:04:11 -07:00
Sam Michel
b968581eb1 Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config
See #28453
2015-10-30 12:41:00 -07:00
Justin Findlay
37ceae1e88 Merge pull request #28448 from gwaters/add-redhat-notes
added a note to the tutorial for redhat derivatives
2015-10-30 12:49:53 -06:00
C. R. Oldham
749383c413 Lint 2015-10-30 11:26:40 -06:00
Mike Place
9b44b5e347 Merge pull request #28426 from terminalmage/pkgbuild-template
pkgbuild.built: make template engine optional
2015-10-30 11:13:36 -06:00
Mike Place
31777cb4e9 Merge pull request #28422 from cachedout/issue_28123
Handle windows logging on thread_multi [WIP]
2015-10-30 11:12:26 -06:00
Mike Place
f9992fc948 Merge pull request #28425 from twangboy/fix_13513
Fix #13513 - Reflection
2015-10-30 11:07:23 -06:00
Gary Waters
e70990704a added a note to the tutorial for those that redhat so they can use the state file too. 2015-10-30 09:47:46 -07:00
twangboy
beb141df69 Fixed some lint 2015-10-29 18:02:24 -06:00
C. R. Oldham
0fa067ea30 Add datacenter getter/setter, change 'dell_switch' to just 'switch', trap call to change_password. 2015-10-29 16:51:15 -06:00
C. R. Oldham
4bcb5a508b Add datacenter getter/setter, change 'dell_switch' to just 'switch', trap call to change_password. 2015-10-29 16:51:15 -06:00
Erik Johnson
6d32497848 pkgbuild.built: make template engine optional 2015-10-29 16:35:21 -06:00
twangboy
0d747355c4 Fix #13513
Removed reflection, hasn't worked since XP
Added a check for existing so it doesn't stack trace when deleting keys
Added use_32bit_registry option
- Works for 64bit machines
- Ignored on 32bit machines
Updated documentation

Added use_32bit_registry option for use with the module
Updated documentation
2015-10-29 16:27:15 -06:00
Mike Place
fd3b2a9e20 Handle windows logging on thread_multi
Refs #28123
2015-10-29 14:24:01 -06:00
Mike Place
4c8cd064a4 Merge pull request #28417 from rallytime/azure-version-warning
Add note about azure sdk version to getting started docs
2015-10-29 13:47:05 -06:00
rallytime
8e3a2ba7e7 Add note about azure sdk version to getting started docs 2015-10-29 15:30:37 -04:00
Mike Place
5ef50d60cd Merge pull request #28406 from rallytime/bp-28381
Back-port #28381 to 2015.5
2015-10-29 13:10:37 -06:00
Mike Place
30d5f7bbae Merge pull request #28413 from rallytime/bp-28400
Back-port #28400 to 2015.5
2015-10-29 12:06:46 -06:00