Commit Graph

75414 Commits

Author SHA1 Message Date
Mike Place
fc9e1dff35 Merge pull request #38248 from meaksh/salt-api-successfully-close-child-processes
Successfully exit of salt-api child processes when SIGTERM is received
2016-12-15 02:16:27 -07:00
Mike Place
3c718ed35e Merge pull request #38254 from terminalmage/check-pillarenv
Also check if pillarenv is in opts
2016-12-15 02:10:24 -07:00
Mike Place
fd32dc3e9b Merge pull request #38262 from terminalmage/issue38228
Fix archive.extracted when --strip or --strip-components is in the options
2016-12-15 01:57:18 -07:00
Mike Place
b232bd8ce8 Merge pull request #38264 from cloudflare/PORT-37862
Port #37862 into 2016.11
2016-12-15 01:51:20 -07:00
Mircea Ulinic
28bbb73151
Import from napalm_base instead of napalm 2016-12-15 06:41:49 +00:00
Mircea Ulinic
0a675afc40
Vice-versa docstring 2016-12-15 06:41:40 +00:00
Mircea Ulinic
09c50176e2
More docfix 2016-12-15 06:41:32 +00:00
Mircea Ulinic
215b8f38e2
Lint cleanup 2016-12-15 06:41:22 +00:00
Erik Johnson
6442f8a7b5 Add tests for --strip/--strip-components
Also add a test for an unspecified archive_format, as this did not have
a test case.
2016-12-14 21:57:14 -06:00
Erik Johnson
c502e68f12 Detect --strip/--strip-components in tar options and handle properly 2016-12-14 21:56:41 -06:00
Erik Johnson
e95770594d Add strip_components arg to archive.list 2016-12-14 21:54:47 -06:00
Nicole Thomas
56a8fa3f77 Add 2016.11.2 release notes (#38260) 2016-12-14 16:40:06 -07:00
Nicole Thomas
702d46244b [2016.11] Bump latest release version to 2016.11.1 (#38257) 2016-12-14 16:28:39 -07:00
Nicole Thomas
6b9060c38f [2016.3] Bump latest release version to 2016.11.1 (#38256) 2016-12-14 16:28:19 -07:00
Erik Johnson
fa9ad311c6 Also check if pillarenv is in opts
This will future-proof this code against a problem similar to the one
fixed by https://github.com/saltstack/salt/pull/37721
2016-12-14 12:13:07 -06:00
Erik Johnson
82b1b77631 Correct an inaccurate warning when top_file_merging_strategy == merge_all (#38233)
The merge_all strategy uses all configured SLS files, so there is no
danger from "merging" like there is in the default strategy. Therefore,
this log entry is spurious when multiple top files exist and the merging
strategy is set to "merge_all".
2016-12-14 11:08:19 -07:00
Daniel Wallace
d1b070c894 clean up selinux unit test 2016-12-14 11:33:00 -06:00
Pablo Suárez Hernández
ee6eae9855 Successfully exit of salt-api child processes when SIGTERM.
So far, salt-api handles connection creating child processes, but this new
processes are not handling the SIGTERM signal, so when `systemctl stop salt-api`
is called the salt-api service is going to be KILLED by `TimeoutStopSec=3`
option of salt-api service. This causes that salt-api looks as FAILED for systemd
even if we perform a manually stop.
FAILED systemd services has different behavior when `systemd try-restart` is called
so we may have troubles i.e. when updating salt-api package.

This commit enables SIGTERM handling for salt-api child processes to perform a
successfully exit after SIGTERM.
2016-12-14 11:34:43 +00:00
Denys Havrysh
c94e798b8a SysV init script for rpm: get and show unique PIDs only 2016-12-14 12:31:42 +02:00
Nicole Thomas
ba62fcf2ec Merge pull request #38234 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2016-12-13 11:28:02 -07:00
Daniel Wallace
96eabd4939 SELINUXTYPE should not be changed
Without the `=`, SELINUXTYPE is also being matched in the
/etc/sysconfig/selinux file is being removed.

Also add `changes` to the result in the selinux state
2016-12-13 12:22:18 -06:00
rallytime
6a327d1367 Merge branch '2016.3' into '2016.11'
No conflicts.
2016-12-13 10:19:47 -07:00
rallytime
26e1ee3650 Strip final 'e' in key cmd to correct "deleteed" misspelling
Fixes #38231
2016-12-13 09:33:28 -07:00
Michael Calmer
4c710139b5 use default values for pop() to prevent KeyError raised 2016-12-13 17:31:58 +01:00
Mike Place
004e46afe7 Merge pull request #38198 from vutny/unit-tests-require-libcloud-boto3
Add missing requirements for running unit tests: libcloud and boto3
2016-12-13 07:12:20 -07:00
Michael Calmer
455c18325c provide kwargs to dockerng.create to provide all features to sls_build as well 2016-12-13 14:31:56 +01:00
Mike Place
9d497bc74c Merge pull request #38213 from rallytime/skip-tls-test
Skip test_cert_info tls unit test on pyOpenSSL upstream errors
2016-12-13 05:05:01 -07:00
Mike Place
203109dd17 Merge pull request #38224 from whiteinge/cors-options-unauthed
Allow CORS OPTIONS requests to be unauthenticated
2016-12-13 05:02:30 -07:00
Denys Havrysh
a6098bac1a Remove note about SaltTesting installation, now it is in the requirements 2016-12-13 11:38:35 +02:00
Mike Place
721a5feccd Merge pull request #38223 from whiteinge/salt-api-root_dirs
Add root_dir to salt-api file paths
2016-12-13 00:44:19 -07:00
Seth House
de4d3227ab Allow CORS OPTIONS requests to be unauthenticated 2016-12-12 22:56:30 -07:00
Seth House
bfbf390c0e Add root_dir to salt-api file paths 2016-12-12 21:30:54 -07:00
rallytime
bdb807fc7c Skip test_cert_info tls unit test on pyOpenSSL upstream errors
The 16.0.0 version of pyOpenSSL has an upstream error in it that
causes a stacktrace in our test suite. The upstream issue has
been fixed in pyOpenSSL in 16.1.0 and upwards, but 16.0.0 is still
available.

This fix skips the test when the specific error generated by the
upstream bug is encountered during the test.
2016-12-12 14:21:41 -07:00
Nicole Thomas
7ead1ed336 Merge pull request #38205 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2016-12-12 11:13:18 -07:00
Nicole Thomas
669409d681 Merge pull request #38203 from rallytime/bp-38188
Back-port #38188 to 2016.11
2016-12-12 10:48:51 -07:00
rallytime
e31f97cf71 Merge branch '2016.3' into '2016.11'
No conflicts.
2016-12-12 10:08:27 -07:00
Andreas Tsaridas
50d3200b12 removing not needed join 2016-12-12 09:21:37 -07:00
Andreas Tsaridas
7af708e1e7 fix for push_dir in different OS 2016-12-12 09:21:36 -07:00
Denys Havrysh
004bff113e Add missing requirements for running unit tests: libcloud and boto3 2016-12-12 13:18:38 +02:00
Mike Place
70f7d22ad6 Merge pull request #38191 from terminalmage/issue38162
Clarify the fact that git_pillar.update does not fast-forward
2016-12-12 02:45:48 -07:00
Mike Place
28171cbfc5 Merge pull request #38194 from vutny/integration-test-requirements-doc
Document the requirements for running ZeroMQ-based integration tests
2016-12-12 02:42:11 -07:00
Denys Havrysh
e9f419ff64 Document the requirements for running ZeroMQ-based integration tests 2016-12-10 22:16:18 +02:00
Erik Johnson
1ae543a98a Clarify the fact that git_pillar.update does not fast-forward 2016-12-09 22:52:12 -06:00
Megan Wilhite
f7294dc85b add 2016.11.1 changelog to release notes (#38186) 2016-12-09 15:44:09 -07:00
Nicole Thomas
a4ef037ab1 Merge pull request #38185 from rallytime/bp-38181
Back-port #38181 to 2016.3
2016-12-09 15:27:44 -07:00
Nicole Thomas
23c039347e Merge pull request #38182 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2016-12-09 14:25:47 -07:00
Mike Place
8355adc535 Merge pull request #38158 from cachedout/issue_38094
Fix type problem in grains.filter_by
2016-12-09 14:24:40 -07:00
Mike Place
31a157d902 Merge pull request #38156 from terminalmage/fix-windows-refresh
Remove rtag when windows minion refreshes early in state
2016-12-09 14:15:01 -07:00
Mike Place
c638952684 Merge pull request #38183 from cro/fix_37891
Fix bad set operations when setting up securitygroups in AWS.
2016-12-09 14:12:10 -07:00
rallytime
609f814454 Reset socket default timeout to None (fixes daemons_tests failures)
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
2016-12-09 13:50:48 -07:00