Commit Graph

69558 Commits

Author SHA1 Message Date
rallytime
d66c992918 Don't merge-forward the change to salt/scripts.py 2016-05-17 14:11:34 -06:00
rallytime
779f31cc20 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-05-17 13:41:19 -06:00
Nicole Thomas
daafa27b60 Cleanup comments in smbios.get output (fixes #33266) (#33306)
As also noted in https://github.com/saltstack/salt/issues/33266, sometimes `dmidecode` will output additional commentary text in strings:

```
root@n01:~# dmidecode -s system-manufacturer                                                                                                                                                                                        
# SMBIOS implementations newer than version 2.8 are not
# fully supported by this version of dmidecode.
Supermicro
```

This PR filters those out.
2016-05-17 13:31:41 -06:00
Nicole Thomas
ced3223b35 Back-port #32993 to 2016.3 (#33304)
* privateIPs and privateDNS are expected to be JSON encoded strings (#32993)

* Import json
2016-05-17 13:31:27 -06:00
gerhardqux
bfe12d9300 Fix iptables --match-set (#23643) (#33314)
Function is expecting two arguments. But after processing state only one
parameter (it contain two words) is pushed into list of options.
This patch reverts the parsing of "iptables --match-set" to the
behaviour of salt v2014.*.

This is a backport of https://github.com/saltstack/salt/pull/28325

Closes #23643
2016-05-17 13:31:06 -06:00
Nicole Thomas
d0ed1616b0 Merge pull request #33308 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-17 13:26:05 -06:00
Erik Johnson
409b187e03 Merge branch 'pr-33147' into develop 2016-05-17 12:55:31 -05:00
Erik Johnson
96f237d9f2 Improve package verification documentation 2016-05-17 12:52:48 -05:00
Erik Johnson
57df1b5161 Accept verify_options and ignore_types as a comma-separated list
Also, simplify the logic used to convert the options passed in
verify_options to command-line arguments.
2016-05-17 12:49:39 -05:00
Shane Lee
348c0364e1 Fix minion start retry on Windows (2016.3) (#33285)
* Fix retry minion start for windows

* Implement Sergey's Fix
2016-05-17 10:38:53 -07:00
rallytime
1c43a62f85 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-17 11:23:41 -06:00
Erik Johnson
b4dab44d31 Merge branch 'pkg-verify-options' of https://github.com/lorengordon/salt into pr-33147 2016-05-17 12:15:00 -05:00
Justin Findlay
7455d0da9b update 2015.8.9 release notes (#33310) 2016-05-17 11:13:09 -06:00
Thomas S Hatch
e3eff27c55 Merge pull request #33293 from twangboy/fix_33277_2015_8
Fix minion start retry on Windows (2015.8)
2016-05-17 11:03:41 -06:00
Nicole Thomas
9b42a05519 Added some more docs for master and minion config settings (#33292)
* Added some more docs for master and minion config settings

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size

* Change "sub minion" to "sub-minion"
2016-05-17 09:58:20 -07:00
Ronald van Zantvoort
8b59f41fa0 Cleanup comments in smbios.get output (fixes #33266) (#33302)
As also noted in https://github.com/saltstack/salt/issues/33266, sometimes `dmidecode` will output additional commentary text in strings:

```
root@n01:~# dmidecode -s system-manufacturer                                                                                                                                                                                        
# SMBIOS implementations newer than version 2.8 are not
# fully supported by this version of dmidecode.
Supermicro
```

This PR filters those out.
2016-05-17 09:56:31 -07:00
Nicole Thomas
22c433184d linux_acl: Allow '-' as a separation character in ACL permissions. Fixes #31270 (#33172) (#33305)
This allows using acl states with things like '- perms: r-x' or '- perms: r--', which also works when manually setting ACL's using setfacl.
2016-05-17 09:53:20 -07:00
Nicole Thomas
7a7018261e Server Density agentv2 support (#32772) (#33303)
* Added support for the agentv2

* Updated os field to match the SD API requirement

* filename is an absolute path on official installations

* Install script URL uses a redirect now, so we should instruct curl to follow them

* Added a missing import

* Updated the settings for the v2 agent

* Fixed pep8 issues

* select v2 agent for the test
2016-05-17 09:50:36 -07:00
rallytime
5004d2fa61 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-17 10:36:07 -06:00
jacobhammons
7e95127467 man pages updated (#33307)
sphinx build fixes
doc additions for new modules including thorium
2016-05-17 10:24:44 -06:00
gerhardqux
8acee5e06c Fix iptables --match-set (#23643) (#33301)
Function is expecting two arguments. But after processing state only one
parameter (it contain two words) is pushed into list of options.
This patch reverts the parsing of "iptables --match-set" to the behaviour
of salt v2014.*.

This is a backport of https://github.com/saltstack/salt/pull/28325

Closes #23643
2016-05-17 10:24:14 -06:00
Julien BONACHERA
7a181f2062 Handle more ipv6 error as an exception #33299 (#33300)
* Handle ipv6 exception in scp_file()

* Handle ipv6 exception in sftp_file()
2016-05-17 10:03:03 -06:00
Vincas Dargis
28bc3952ac Fix documentation typo in salt.modules.state.high (#33297)
salt.modules.state.high documentation has typo "andis" instead of "and is".
2016-05-17 07:36:12 -07:00
Erik Johnson
eb47a15a5e Ignore retcode when checking service's status (#33294)
* Pass an actual error message when raising exception

* debian_service.py: ignore retcode when checking service's status

This prevents spurious errors from being logged when a nonexistant
service is polled, or the service is not running.

* freebsdservice.py: ignore retcode when checking service's status

This prevents spurious errors from being logged when a nonexistant
service is polled, or the service is not running.

* netbsdservice.py: ignore retcode when checking service's status

This prevents spurious errors from being logged when a nonexistant
service is polled, or the service is not running.

* openbsdservice.py: ignore retcode when checking service's status

This prevents spurious errors from being logged when a nonexistant
service is polled, or the service is not running.
2016-05-17 07:08:59 -07:00
Erik Johnson
a2cd7f9be0 Merge pull request #33286 from rallytime/doc-new-configs
Document new master and minion config opts for 2016.3.0
2016-05-16 19:44:02 -05:00
David Boucha
757ef20a31 fix "loose" typo (#33290) 2016-05-16 17:13:40 -06:00
twangboy
652f0079db Fix minion start retry on Windows 2016-05-16 15:46:54 -06:00
Nicole Thomas
b7d98da64d Add auth_tries config option to minion.rst docs (#33287) 2016-05-16 14:17:19 -07:00
Nicole Thomas
8d805e6595 Lint #32985 (#33278)
* Fix context clash.

boto_vpc uses both boto and boto3. Both utils for those use the same name for their connection context. If you used states that required both boto and boto3, the get_conn would return the object.

* Add a unit test to the boto context conflict problem

* Fix pylint errors and ensure new test to runs correctly

Merges #32985

* Fix typo
2016-05-16 15:02:05 -06:00
Nicole Thomas
9e79250f31 Merge pull request #33279 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-05-16 15:01:39 -06:00
rallytime
fdc877b4dc Document new master and minion config opts for 2016.3.0
Docs were added for:
  - master_tries
  - mine_enabled
  - mine_return_job
  - syndic_failover
  - auth_tries: this is an old setting, but docs were not found
in the minion.rst docs. This change should be added to older branches.
2016-05-16 14:51:13 -06:00
Nicole Thomas
061851bcbf Document minion_id_caching config value (#33282)
Fixes #33276
2016-05-16 13:12:38 -07:00
Seth House
01ce818092 Finish the match.filter_by example (#33281) 2016-05-16 13:12:07 -07:00
C. R. Oldham
8387657d9a Prevent salt-cloud from hanging when spinning up new Vultr instances (#33272)
* better support for named images, locations, sizes

* better support for named images, locations, sizes

* Tests for Vultr driver

* Add sleep so test instance will be old enough to delete as part of the test

* Lint.
2016-05-16 13:11:29 -07:00
rallytime
799993a6c7 Pylint fix 2016-05-16 13:48:13 -06:00
Nicole Thomas
59a84a4674 Add docs for new master failback options (#33280)
Fixes #32492
2016-05-16 12:11:38 -07:00
rallytime
c8b8d82745 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/proxy/junos.py
2016-05-16 12:32:23 -06:00
Nicole Thomas
2985aef0ac Merge pull request #33275 from rallytime/merge-2106.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-16 11:59:57 -06:00
jirikotlin, jiri.kotlin@ultimum.io
319a4d8288 Files without pkg.owner are not skipped (#33202) 2016-05-16 10:02:51 -07:00
Nicole Thomas
3b8524caf7 Don't send passwords after shim delimiter is found (#33273)
The SSH_PASSWORD_PROMPT_RE regexp used to detect if SSH is requesting a
password can be triggered if the shim is returning data to the server
with text that matches the regex, including inside JSON results. This
then results in the server unable to parse the JSON results. This
patch fixes this issue by looking for the shim delimiter in the output and
disabling the sending of passwords after the delimiter is found.

Fixes #29422.
2016-05-16 10:01:19 -07:00
rallytime
32779b8d71 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/x509.py
2016-05-16 10:47:12 -06:00
Nicole Thomas
06edba448e Merge pull request #33274 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-16 10:41:32 -06:00
leufroy
e0cf74b0e7 Fix two pure python errors causing UnboundLocalErrors (#33268)
* fix UnboundLocalError in 'container_resource.run'  (issue #33267)

This happends when VT could not be created.

Because `proc` must exist in the `finally` block, we put it outside
the `try` block and let the code fails when the vt creation fails.

* fix UnboundLocalError in lxc runner (issue #30864)

`saved_kwargs` seems only useful inside the ``if saltcloud_mode:``
block. This name can not be called outside the block where it is
created.
2016-05-16 09:31:22 -07:00
Őry, Máté
0de5410d18 postgres.db_create: fix handling of empty string (#33261)
* modules.postgres: fix handling of empty string in db_create

The code responsible for collecting the parameters used in the CREATE
DATABASE query works unexpectedly in case for values which are evaluated
to False as bool, but are not None.

This caused queries with missing rvalues like this one (lc_collate=""):
2016-05-13 16:04:05,243 [salt.loaded.int.module.cmdmod][ERROR   ][2990]
stderr: ERROR:  syntax error at or near "OWNER"
LINE 1: ..._production" WITH ENCODING = 'utf8' LC_COLLATE =  OWNER =
"g...

Please note that proper escaping or a different approach would be needed
here.

* modules.postgres: handle trivial sqli in db_create

* modules.postgres: fix OrderedDict usage

* modules.postgres: quote TABLESPACE too in db_create
2016-05-16 09:27:40 -07:00
Brad Thurber
325befa557 new runner for vistara (#33263)
* new runner for vistara

* clean lint
2016-05-16 09:23:16 -07:00
rallytime
bf641d3a66 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-16 10:14:43 -06:00
Kevin Alberts
2f76a2dc34 linux_acl: Allow '-' as a separation character in ACL permissions. Fixes #31270 (#33172)
This allows using acl states with things like '- perms: r-x' or '- perms: r--', which also works when manually setting ACL's using setfacl.
2016-05-16 08:01:09 -07:00
Eric Radman
d7bd667f79 Unbreak passwd change/expire reading on OpenBSD (#33227)
Tested on OpenBSD 5.9, the format for master.passwd for NetBSD should be
the same.
2016-05-16 07:56:51 -07:00
Jorge Schrauwen
ce6cbffd6e allow retrieval of sdc properties (#33235) 2016-05-16 07:53:11 -07:00
Rob Nagler
1e636f141f allow top cfg to be YAML for consistency and flexibility (current syntax does not allow blank lines or comments) (#33189) 2016-05-16 07:49:31 -07:00