Commit Graph

61775 Commits

Author SHA1 Message Date
Erik Johnson
855bed36c1 Check rendered YAML for invalid keys (#33213)
* Check rendered YAML for invalid keys

PyYAML will for some reason allow improper YAML, specifically double
curly-braces like ``{{ }}``, to be formed into an unhashable dict (that
is, one with a dict as a key). This commit will change the YAML renderer
such that the rendered data is recursively checked for keys that are
dicts, and raises an SaltRenderError if such a key is encountered.

Resolves #33073.

* Fix smtp returner test

This test was using jinja placeholders but was not passing the template
through the jinja renderer. This commit adds the use of the jinja
renderer to this test to fix the failure caused by the addition of
verification of the loaded YAML inthe previous commit.
2016-05-13 09:22:43 -07:00
Nicole Thomas
6fb25a8440 Make note of files that begin with '_' in master.d or minion.d dirs (#33224)
* Make note of files that begin with '_' in master.d or minion.d dirs

Fixes #21903

* Be more specific about where '_' files come from.
2016-05-13 09:14:57 -07:00
Nicole Thomas
a6dc0d2d05 Gate jnpr imports in salt.proxy.junos.py (#33150)
* Gate jnpr imports in salt.proxy.junos.py

Fixes #31975

The doc build fails when these are not gated because jnpr raises
an ImportError.

* Remove logging line for copy/paste
2016-05-13 09:13:22 -07:00
Nicole Thomas
64a89c4883 Add docs for the http state (#33222)
* Add docs for the http state

Fixes #21315

* Fix typo
2016-05-13 09:07:58 -07:00
Nicole Thomas
0a32163d63 Don't stacktrace when using --out=highstate at CLI during staterun. (#33215)
Fixes #29796
2016-05-13 08:23:35 -07:00
Laurent
04d714df6a propagate opts to salt.util.http call (#33219) 2016-05-13 08:03:24 -07:00
Justin Findlay
c8236c05cb update 2015.8.9 release notes (#33237) 2016-05-13 08:40:23 -06:00
Nicole Thomas
6dc5d605b1 Merge pull request #33217 from rallytime/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-12 16:45:39 -06:00
rallytime
4655607b58 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-12 15:44:56 -06:00
Thomas S Hatch
698f1eb657 Merge pull request #33211 from cachedout/user_kill
Don't try to kill a parent proc if we can't
2016-05-12 15:29:50 -06:00
Nicole Thomas
730bec1eef [2015.8] Merge forward from 2015.5 to 2015.8 (#33207)
* Fix file.managed for Windows (#33181)

* Revert back to import string_types

For some reason, there is a problem with the following
code when run from the file.py module:
```
from salt.ext import six
comment = 'This is a string'
isinstance(comment, six.string_types)
```
When run from within the python shell it works fine.

* Add six import

* Fix some lint

* Use correct six import

* Changed it back to explicit import

* Additional comments specific to 2015.5

* Fix file.managed for real

* Move comment to clarify purpose

* update 2015.5.11 release notes (#33197)

* Add pip installed and removed test (#33178)

* Resolve issue with pkg module on Mint Linux (#33205)

Closes #32198
2016-05-12 13:54:47 -07:00
Mike Place
d4f2e5baa7 Don't try to kill a parent proc if we can't 2016-05-12 14:02:00 -06:00
Erik Johnson
379b151d75 Add a fetch when compiling git_pillar for masterless minions (#33204)
Fixes #32917.
2016-05-12 13:53:51 -06:00
Mike Place
f86832911e Resolve issue with pkg module on Mint Linux (#33205)
Closes #32198
2016-05-12 12:23:34 -06:00
Justin Findlay
b3805d825a cloud.clouds.ec2: cache each named node (#33164) 2016-05-12 10:16:27 -07:00
Erik Johnson
86db5df7c1 Properly handle failed git commands when redirect_stderr=True (#33203)
* Properly handle redirected stderr

When running subprocess.Popen.communicate() on a command run with stderr
redirected to subprocess.STDOUT, the 2nd element of the return tuple
(representing the stderr) will be None, since all of the standard error
was sent to stdout.

Functions interpreting the return data from cmd.run_all will be
expecting the ``stderr`` key in the return dict to contain a string, not
a NoneType, so this commit forces the stderr to be set to an empty
string when redirect_stderr is True.

* Look at stdout instead of stderr for error text when redirect_stderr is True
2016-05-12 10:10:46 -07:00
Justin Anderson
a09e1b6335 Add pip installed and removed test (#33178) 2016-05-12 08:31:41 -07:00
Erik Johnson
8a0950de27 Don't force use of global ssh_config when git identity file is specified (#33152)
I can no longer reproduce the edge case I was trying to fix with this
logic, and it's a bad solution anyway in that it caused #32685.
2016-05-12 08:28:19 -07:00
Justin Findlay
ce071330de update 2015.8.9 release notes (#33198) 2016-05-12 05:03:07 -06:00
Justin Findlay
96e3586f12 update 2015.5.11 release notes (#33197) 2016-05-12 04:54:40 -06:00
Shane Lee
09b072a412 Fix file.managed for Windows (#33181)
* Revert back to import string_types

For some reason, there is a problem with the following
code when run from the file.py module:
```
from salt.ext import six
comment = 'This is a string'
isinstance(comment, six.string_types)
```
When run from within the python shell it works fine.

* Add six import

* Fix some lint

* Use correct six import

* Changed it back to explicit import

* Additional comments specific to 2015.5

* Fix file.managed for real

* Move comment to clarify purpose
2016-05-11 17:59:05 -06:00
Nicole Thomas
6177a6a36f Merge pull request #33188 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-11 16:32:29 -06:00
rallytime
f12bba6ebc Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
2016-05-11 15:14:23 -06:00
Nicole Thomas
30868ab06c [2015.5] Update to latest bootstrap script v2016.05.11 (#33185) 2016-05-11 14:41:53 -06:00
Thomas S Hatch
264ad34b3b Pip fix (#33180)
* fix pip!!

* make it work with old pip as well

* Added resiliency

* Don't need to check, just get the right name
2016-05-11 14:39:30 -06:00
Justin Findlay
e9108e0c1c add 2015.8.9 release notes (#33161) 2016-05-10 18:39:09 -06:00
Justin Findlay
43288b268d add 2015.5.11 release notes (#33160) 2016-05-10 18:12:56 -06:00
Nicole Thomas
2d9919eb11 [2015.8] Update to latest bootstrap script v2016.05.10 (#33156) 2016-05-10 17:20:01 -06:00
Nicole Thomas
e0da8fda7d [2015.5] Update to latest bootstrap script v2016.05.10 (#33155) 2016-05-10 17:19:51 -06:00
Mike Place
033bef2ed2 Hash fileclients by opts (#33142)
* Hash fileclients by opts

There was an issue whereby the cache of the fileclient was being overwritten
by dueling minion instances in multimaster mode. This protects them by hashing
by the id of opts.

Closes #25040

* Silly typo!

* Remove tests which do not test any actual functionality or are too tightly coupled to the implementation
2016-05-10 15:04:52 -06:00
Nicole Thomas
f520fa3cf1 Back-port #31769 to 2015.8 (#33139)
* Handle empty acl_name in linux_acl state

Calls to setfacl interpret an empty group or user name to mean to be the
owner of the file they're operating on. For example, for a directory
owned by group 'admin', the ACL 'default:group::rwx' is equivalent to
'default:group:admin:rwx'.

The output of the getfacl execution module returns ACLs in the format of
'group:admin:rwx' instead of 'group::rwx'. This commit changes the
acl.present state to look for the owner of the file if the acl_name
paremeter is empty.

* Fix acl.present/acl.absent changing default ACLs

The behaviour of the acl.present and acl.absent is to check the data
structure returned by getfacl contains a key by the name of acl_type.

However, this data structure does not contain any default ACLs if none
exist, so this check will fail. We omit the check if a default ACL was
passed into the state functions.

Unfortunately, the call to modfacl may fail if the user passes in an
acl_type such as 'default:random'. In this case the state will appear to
succeed, but do nothing.

This fixes the state module to allow setting default ACLs on files which
have none.
2016-05-10 13:21:55 -07:00
Nicole Thomas
2800762b44 Merge pull request #33144 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-10 13:40:31 -06:00
rallytime
449176f06e Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-10 11:58:55 -06:00
Nicole Thomas
6cd1641840 Merge pull request #33141 from jtand/disable_local_pkg_install_test
Skipping salt-call --local test
2016-05-10 11:05:17 -06:00
Nicole Thomas
72d075e14e Merge pull request #33140 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-10 10:57:55 -06:00
Justin Anderson
8b1e34fb17 Skipping salt-call --local test 2016-05-10 10:48:18 -06:00
rallytime
c732c8104b Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/conf.py
2016-05-10 09:27:18 -06:00
Nicole Thomas
ad607ef4a9 If cache_jobs: True is set, populate the local job cache when running salt-call (#33100)
* If cache_jobs: True is set, populate the local job cache

Fixes #32834

Allows a masterless minion to query the job cache.

* Refactor cache_jobs functionality to be DRY
2016-05-10 07:38:07 -07:00
Anthony
64689a6dbb Fix broken parsing of usermgmt.conf on OpenBSD (#33135)
When creating a new user, if a group of the same name already exists,
the usermgmt.conf file is consulted to determine the primary group.
It's in these cases that the parsing bug is triggered.

This code change addresses several of the existing issues:

- The previous split statement explicitly specified a single space.
  Since a config line may have any number of spaces and/or tabs
  surrounding the entries, the resulting array's elements may be
  incorrect.

- According to the man pages for usermgmt.conf, the "group" config
  entry accpets a single parameter -- so we shouldn't iterate.

- The "val[1]" was returning the 2nd letter of each word and not the
  second word on the config line as intended.
2016-05-10 07:33:32 -07:00
Seth House
878d34a865 Doc mock decorators (#33132)
* Add mock function for mocking decorators

* Mock the stdlib user module because importing it will open the repl
2016-05-10 07:25:13 -07:00
Nicole Thomas
06a382e59c Add a check that the cmdline of the found proc matches (#33129) 2016-05-09 15:15:34 -07:00
Erik Johnson
10018e9156 salt.utils.gitfs: fix formatting for warning messages (#33064)
* salt.utils.gitfs: fix formatting for warning messages

When git_pillar support was added to salt.utils.gitfs, the
recommendation globals had string formatting placeholders added to them,
but the locations where these values are referenced do not call
``.format()`` to properly replace them. This commit fixes that
oversight.

* Remove more gitfs and master-specific wording from log messages
2016-05-09 13:10:19 -07:00
Shane Lee
d45b599036 Fix 33058 (#33099)
* Fix servermanager module

- Added check for 2008 version of windows
- Added Import-Module ServerManager to _pshell_json.
  Apparently this needs to run each time we issue a
  servermanager command.

* Fix list_available
2016-05-09 09:45:11 -07:00
Colton Myers
8acc3147d6 Merge pull request #33106 from abednarik/abednarik_master_Finger_stacktrace
Moved _finger_fail method to parent class.
2016-05-09 10:31:09 -06:00
abednarik
91a69ba54a Moved _finger_fail method to parent class.
Method _finger_fail method from SAuth to AsyncAuth class to make method available
in both class and fix an issue where _finger_Fail is called inside AsyncAuth.
2016-05-07 11:34:15 -03:00
Megan Wilhite
20c7e10793 clarify docs that map is designed to be run once. is not stateful (#33102) 2016-05-06 15:53:31 -06:00
Nicole Thomas
558561d86f cloud.query needs to define mapper.opts (#33098) 2016-05-06 14:17:34 -06:00
Nicole Thomas
c1f7aed8a5 Merge pull request #33096 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-06 13:27:57 -06:00
rallytime
0fd5e9d157 Merge branch '2015.5' into '2015.8'
Conflits:
  - salt/minion.py
  - tests/integration/states/file.py
2016-05-06 12:04:06 -06:00
Mike Place
30edeadafd Lower display of msgpack failure msg to debug (#33078)
Closes #33074
2016-05-06 08:28:14 -07:00