Commit Graph

76816 Commits

Author SHA1 Message Date
Bruno Binet
e6a544540f add grafana4_dashboard salt state 2016-12-15 11:01:43 +01:00
Bruno Binet
99df5df2e6 add grafana4_datasource salt state 2016-12-15 11:01:21 +01:00
Bruno Binet
435bd583ca add grafana4_user salt state 2016-12-15 11:01:03 +01:00
Bruno Binet
d800f9ecf8 add grafana4 salt module 2016-12-15 11:00:24 +01:00
rajvidhimar
3b4b49ee34 Change the parser for junos syslog 2016-12-15 15:28:50 +05:30
Elias Wulcan
5f9b6c8ba4 Fixed nested orchestrate not respecting failures
Client was only setting success to false if the function called raised
an exception. This commit changes it to verify the content of return
value with check_state_result
2016-12-15 10:33:25 +01:00
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
3f95eb9f02 Merge pull request #38249 from mhlavac/patch-1
aptpkg.py support KDE neon distro
2016-12-15 02:14:08 -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
d830a37254 Merge pull request #38261 from minaguib/fix/ps
Always use ps -efHww
2016-12-15 02:00:55 -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
Mina Naguib
eb3b213266 Always use ps -efHww
The "ww" isn't only needed in Debian, but likely all linux distros

Accorging to "ps" docs, there are several invocation cases where the
output width is undefined, unless env COLUMNS or 'ww' is specified
2016-12-14 20:54:02 -05:00
Nicole Thomas
56a8fa3f77 Add 2016.11.2 release notes (#38260) 2016-12-14 16:40:06 -07:00
Nicole Thomas
2e480cfb77 [develop] Bump latest release version to 2016.11.1 (#38258) 2016-12-14 16:29:02 -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
rallytime
c5e0b90fc9 Pylint: Remove unused import 2016-12-14 15:48:23 -07:00
rallytime
56413cfb53 Various pillar deprecations for Nitrogen
- Remove support for legacy sqlite3 pillar configuration
- Remove support for the "raw_data" kwarg in the file_tree external pillar
2016-12-14 14:54:16 -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
Arthur Wikström
23d69c4ffe Updated expected test results for mac_package 2016-12-14 14:11:49 +01:00
Martin Hlaváč
4fca53d0eb aptpkg.py support KDE neon distro
KDE Neon just released LTS version based on LTS Ubuntu 16.04, unfortunately it's release as "neon" dist.

I get error while installing packages.

Salt state:
```
lame:
  pkg.latest
```

```
          ID: lame
    Function: pkg.latest
      Result: False
     Comment: State 'pkg.latest' was not found in SLS 'lame'
              Reason: 'pkg' __virtual__ returned False                                                                                                                                                                                                                                                                               
     Changes:   
```

```
$ salt-call --versions-report
Salt Version:
           Salt: 2016.11.0
 
Dependency Versions:
           cffi: Not Installed
       cherrypy: Not Installed
       dateutil: 2.4.2
          gitdb: Not Installed
      gitpython: Not Installed
          ioflo: Not Installed
         Jinja2: 2.8
        libgit2: Not Installed
        libnacl: Not Installed
       M2Crypto: Not Installed
           Mako: 1.0.3
   msgpack-pure: Not Installed
 msgpack-python: 0.4.6
   mysql-python: Not Installed
      pycparser: Not Installed
       pycrypto: 2.6.1
         pygit2: Not Installed
         Python: 2.7.12 (default, Nov 19 2016, 06:48:10)
   python-gnupg: Not Installed
         PyYAML: 3.11
          PyZMQ: 15.2.0
           RAET: Not Installed
          smmap: Not Installed
        timelib: Not Installed
        Tornado: 4.2.1
            ZMQ: 4.1.4
 
System Versions:
           dist: neon 16.04 xenial
        machine: x86_64
        release: 4.4.0-53-generic
         system: Linux
        version: neon 16.04 xenial
```
2016-12-14 13:48:56 +01: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
Arthur Wikström
ec8ef53d56 Properly quote .app files containing spaces 2016-12-14 10:48:45 +01:00
Nicole Thomas
aca6a1f266 Merge pull request #38237 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-12-13 17:00:55 -07:00
rallytime
294d318683 Make sure we have a "driver" key when deleting VMs 2016-12-13 16:33:42 -07:00
rallytime
096d12b22c Fix TypeError in ec2 driver: this should still be "provider", not "driver" 2016-12-13 16:32:49 -07:00
rallytime
fe1e24909e Merge branch '2016.11' into 'develop'
No conflicts.
2016-12-13 11:29:16 -07: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
0e1ffbc210 Merge pull request #38214 from rallytime/fix-35502
Remove Nitrogen deprecations in the glance module
2016-12-13 05:03:38 -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