Commit Graph

59915 Commits

Author SHA1 Message Date
C. R. Oldham
7c35333509 Force a grains sync after we load the proxy's grains. 2016-01-12 08:06:33 -07:00
C. R. Oldham
2855ba7da5 Disallow non-proxyenabled modules and grains 2016-01-12 07:53:09 -07:00
Colton Myers
54b9641330 Merge pull request #30186 from rallytime/fix-29951
Update CLI Examples in boto_ec2 module to reflect correct arg/kwarg positioning
2016-01-08 12:00:45 -07:00
Colton Myers
1256fd11e1 Merge pull request #30156 from abednarik/ignore_whitespace_file_append
Add option in file.append to ignore_whitespace.
2016-01-08 09:07:23 -07:00
Colton Myers
ad7522c98d Merge pull request #30189 from rallytime/bp-30185
Back-port #30185 to 2015.8
2016-01-07 16:32:05 -07:00
Nicole Thomas
8f30f7045a Merge pull request #30215 from jacobhammons/doc-issues
Assorted doc bug fixes
2016-01-07 14:53:27 -07:00
Jacob Hammons
44ce704206 Updated zmq_monitor docs 2016-01-07 14:26:33 -07:00
Jacob Hammons
0d2111d397 Assorted doc bug fixes
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
2016-01-07 14:08:30 -07:00
abednarik
af68086e5c Add option in file.append to ignore_whitespace.
When appending content to a file, salt will try to search for that content first. During this
operation whitespace is ignored. This option allows to override this bahavior.

Fixes #28586.
2016-01-07 17:26:25 -03:00
Mike Place
2000800915 Merge pull request #30206 from cachedout/revert_30168
Revert "Fix incorrect file permissions in file.line"
2016-01-07 10:55:48 -07:00
Mike Place
ee786293e7 Revert "Fix incorrect file permissions in file.line"
Refs #30204

This reverts commit 79daa25a15.
2016-01-07 10:54:34 -07:00
jacobhammons
5632ccb796 Merge pull request #30190 from jacobhammons/banners
Updated doc site banners
2016-01-06 15:37:33 -07:00
Jacob Hammons
266023baf1 Updated doc site banners 2016-01-06 15:16:26 -07:00
Mike Place
70681bf03b Fix for mock state PR #30118 2016-01-06 15:10:19 -07:00
Thomas S Hatch
f9480f66d8 change arg to mocked to try test suite collision fix 2016-01-06 15:07:36 -07:00
Thomas S Hatch
2fbdcda703 fix some typos 2016-01-06 15:05:45 -07:00
Thomas S Hatch
6f757b8c81 Add Mock to state.sls 2016-01-06 15:05:45 -07:00
Thomas S Hatch
fb0cbd185e fix issue where the name may be in 2 places 2016-01-06 15:04:55 -07:00
Thomas S Hatch
5f0326e521 Start on the state mock system 2016-01-06 15:04:55 -07:00
rallytime
a943b505cc Update CLI Examples in boto_ec2 module to reflect correct arg/kwarg positioning
Fixes #29951
2016-01-06 14:29:23 -07:00
Colton Myers
9a83247992 Merge pull request #30180 from jfindlay/2.7x509
modules.x509._dec2hex: add fmt index for 2.6 compat
2016-01-06 12:48:50 -07:00
Colton Myers
6516d5b5d0 Merge pull request #30179 from terminalmage/bp-26962
Backport #26962 to 2015.8 branch
2016-01-06 12:48:30 -07:00
Justin Findlay
907469d04a modules.x509._dec2hex: add fmt index for 2.6 compat
Fixes #30171.
2016-01-06 11:21:23 -07:00
Rene Fragoso
08f2021f52 Fix pylint warnings: unnecessary parens after if keyword 2016-01-06 11:58:09 -06:00
Rene Fragoso
a2ec721661 Add --state-verbose command line option to salt cmd
This overrides the state_verbose setting that may be set in master config.

If master has state_verbose set to True

--state-verbose=False would suppress states that didn't change.

If master config has state_verbose set to False

--state-verbose=True would still show states that didn't have changes.

Below is test output with state_verbose=True in ./etc/salt/master:

```
$ salt -c ./etc/salt '*' --state-verbose=True  state.highstate
salt-dev:
----------
          ID: test_file.txt
    Function: file.managed
        Name: /tmp/test_file.txt
      Result: True
     Comment: File /tmp/test_file.txt exists with proper permissions. No changes made.
     Started: 13:51:15.798599
    Duration: 7.176 ms
     Changes:

Summary for salt-dev
------------
Succeeded: 1
Failed:    0
------------
Total states run:     1
Total run time:   7.176 ms

$ salt -c ./etc/salt '*' --state-verbose=False  state.highstate
salt-dev:

Summary for salt-dev
------------
Succeeded: 1
Failed:    0
------------
Total states run:     1
Total run time:   8.589 ms
```
2016-01-06 11:58:09 -06:00
Colton Myers
27df7276bc Merge pull request #29693 from abednarik/handle_missing_source_in_ssh_auth
Handle missing source file in ssh_auth.
2016-01-06 10:13:06 -07:00
Colton Myers
f9863dd9fb Merge pull request #30155 from rallytime/boto-secgroup-docfix
Update boto_secgroup and boto_iam_role docs to only use region OR profile
2016-01-06 10:09:50 -07:00
Colton Myers
e36e8e2e73 Merge pull request #30158 from rallytime/fix-29905
Move _option(value) calls to __salt__['config.option'] in boto utils
2016-01-06 09:35:58 -07:00
Colton Myers
ec009a6812 Merge pull request #30160 from saltstack/aix_dskusage
Fix parsing disk usage for line with no number and AIX values in Kilos
2016-01-06 09:34:45 -07:00
Colton Myers
f808ffbbbd Merge pull request #30162 from rallytime/fix-29919
Update list_present and append grains state function docs to be more clear.
2016-01-06 09:33:25 -07:00
Colton Myers
83245930a6 Merge pull request #30163 from rallytime/fix-28923
Add warning about using "=" in file.line function
2016-01-06 09:32:39 -07:00
Colton Myers
106efd258a Merge pull request #30164 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-01-06 09:28:59 -07:00
Colton Myers
e5d87a02b9 Merge pull request #30168 from abednarik/2015.8
Fix incorrect file permissions in file.line
2016-01-06 09:25:08 -07:00
abednarik
79daa25a15 Fix incorrect file permissions in file.line
Looks like atomic_open() doesn't take care of preserving file permissions.  It will create
a new file, edit it and then move this temp file to the original file ignoring file permissions.
Also updated the check to be sure file exist and is a file. Otherwise code will try to update
directory content and will fail badly and throw a python error.
2016-01-05 22:58:24 -03:00
Colton Myers
d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/ssh/index.rst
2016-01-05 16:11:20 -07:00
rallytime
0e4f91fca2 Add warning about using "=" in file.line function
Warnings for passing kwargs with equal signs as part of the value
exist in other file.x functions, but was missing for the file.line
execution module function. This adds the relevant warning.

Fixes #28923
2016-01-05 15:40:39 -07:00
rallytime
9bbd129c60 Update list_present and append grains state function docs to be more clear
Fixes #29919
2016-01-05 15:21:12 -07:00
David Murphy
8450df0483 Fix parsing disk usage for line with no number and AIX values in Kilos 2016-01-05 15:05:59 -07:00
rallytime
3321c5d408 Move _option(value) calls to __salt__['config.option'] in boto utils
Removed the _option function - this isn't a complete offering of finding
pillar lookups.

Refs #29905
2016-01-05 12:59:04 -07:00
rallytime
f0381a955f Update boto_secgroup and boto_iam_role docs to only use region OR profile.
If you specify a profile, you need to have key, keyid, and region set within
the profile. If region is set outside of the profile group, it is ignored,
and a default region is used.

This pull request updates the docs to model this usage correctly.
2016-01-05 11:49:58 -07:00
Mike Place
9363d6f5b6 Merge pull request #30125 from abednarik/update_user_home
Update user home event when createhome is set to False
2016-01-05 11:15:38 -07:00
Mike Place
bed38d1a65 Merge pull request #30154 from Oro/fix-file-serialize-windows
Fix file serialize on windows
2016-01-05 11:08:40 -07:00
Marco Orovecchia
071a675f8a Fix file serialize on windows
This fixes the file.serialize state on windows.
Currently, it fails on the first run (with "Failed to change group to Administrators" and succeeds on runs afterwards.
2016-01-05 17:37:01 +01:00
Mike Place
7d51d8bb46 Merge pull request #30144 from rallytime/vsphere-esxcli-cmd
Added generic ESXCLI command ability to ESXi Proxy Minion
2016-01-05 09:23:38 -07:00
rallytime
2f9ec5db96 Added generic ESXCLI command ability to ESXi Proxy Minion 2016-01-04 16:04:50 -07:00
Mike Place
1a21b3d46b Merge pull request #30142 from terminalmage/issue29994
Fix dockerng.push, and allow for multiple images
2016-01-04 15:53:50 -07:00
Erik Johnson
66698986e4 Fix dockerng.push, and allow for multiple images
When I wrote dockerng, I was scraping the API response for the ID of the
image specified in the docker 'push' command. This information is no
longer present in the Docker Remote API response, which makes the
function think that the push failed when it did not.

This commit removes the ``Id`` and ``Image`` keys from the return
dictionary, as they can no longer reliably be determined from the API
response without it being some sort of hack that will no doubt be broken
the next time Docker decides to change their API.

Not only that, but the status message used to detect a pushed or
already-present layer has also been changed, which necessitated a fix in
``_push_status()``.

This also resolves #29994 by allowing the user to push all tags for a
given repo by omitting the tag.
2016-01-04 15:42:58 -06:00
Mike Place
5419699bd2 Merge pull request #30075 from iodatacenters/2015.8_gluster_usexml
Convert glusterfs module to use xml
2016-01-04 13:33:58 -07:00
Mike Place
a6d94358ed Merge pull request #30129 from optix2000/2015.8
Clean up _uptodate() in git state
2016-01-04 13:23:17 -07:00
Mike Place
68dfa0f5de Merge pull request #30139 from rallytime/bp-29589
Back-port #29589 to 2015.8
2016-01-04 13:22:47 -07:00