Commit Graph

80354 Commits

Author SHA1 Message Date
Theodore Cowan
7cf8544d63 fix more lint errors for boto_elbv2 PR 2017-03-25 09:37:02 -06:00
Theodore Cowan
2b9e184577 fix lint errors for boto_elbv2 PR 2017-03-25 08:57:21 -06:00
Joseph Hall
7106a86258 Use named kwargs 2017-03-25 06:34:19 -06:00
Vitali Quiering
395abf80cc Changed kwarg list order in start() 2017-03-25 12:09:18 +01:00
Anthony Shaw
ee0daa1b64
remove unused imports 2017-03-25 11:44:55 +11:00
rallytime
c65d602f60 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/cli/batch.py
2017-03-24 17:11:49 -06:00
Nicole Thomas
d73a526fba Merge pull request #40309 from rallytime/redis-cache-docs
Move "redis" to "redis_cache" references in docs
2017-03-24 16:40:07 -06:00
Nicole Thomas
566ae5ef1d Merge pull request #40267 from lomeroe/revert_keys_removal
win_lgpo re-add .keys() usage in places needed due to dict modifications durin…
2017-03-24 16:38:57 -06:00
Nicole Thomas
fa534eff25 pylint: One more space before inline comment 2017-03-24 16:36:21 -06:00
Nicole Thomas
9d0762deca Merge pull request #40277 from eldadru/Fix-40247-boto_rds-delete-wait-for-deletion-failure
Fixing boto_rds.py delete() wait_for_deletion,  if statement was inco…
2017-03-24 16:29:24 -06:00
Nicole Thomas
6c29c81d01 Merge pull request #40280 from bewing/bp_40273
Clean up temporary file in net.load_template
2017-03-24 16:27:04 -06:00
Nicole Thomas
7c21153d3a Merge pull request #40300 from meaksh/2016.3-adding-timeouts-parameters-to-cmd_batch
Fixes 'timeout' and 'gather_job_timeout' kwargs parameters for 'local_batch' client
2017-03-24 16:25:21 -06:00
Nicole Thomas
0031a61f80 Merge pull request #40286 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-03-24 16:09:47 -06:00
Nicole Thomas
2b22e871c7 Merge pull request #40289 from mattp-/patch-1
typo in states/netconfig.py
2017-03-24 15:58:24 -06:00
Nicole Thomas
839b620f32 Merge pull request #40310 from gtmanfred/2016.11
add warning when no host/dns record is found for fqdn_ip
2017-03-24 15:55:19 -06:00
Nicole Thomas
bd1799c67f Merge pull request #40249 from cloudflare/proxy-dox
More proxy documentation
2017-03-24 15:47:57 -06:00
Joseph Hall
822f3b81c3 Add minimum and maximum to calls to calc 2017-03-24 15:24:25 -06:00
Ethan Moore
f0214758ab lint fixes 2017-03-24 21:17:14 +00:00
rallytime
5363e0b58b Update minion data cache documentation
Updats the existing documentation and also adds more documentation
to the Multi-Master and Syndic topology files about the addition
of the pluggable minion data store.
2017-03-24 14:25:46 -06:00
Mike Place
eb86d55478 Merge pull request #40288 from dmurphy18/aix_network
Execution module network support for AIX
2017-03-24 14:10:35 -06:00
Daniel Wallace
cff027ddc6 add warning when no host/dns record is found for fqdn
We appear to be running across an upstream bug of socket.getaddrinfo. If the
ipv4 address is set for the hostname in /etc/hosts, but the ipv6 address is
not, we run into the timeout.  If the ipv6 is set, but the ipv4 is not, then
everything works as expected.  If neither are set, and you don't have
`myhostname` in nsswitch.conf for hosts, then it will fail for both if dns is
not setup.

There is not much else we can do besides log a warning so that users make sure
that their hostname lookups are setup correctly.

```
root@saltmaster:~# cat /etc/hosts
::1 saltmaster.local saltmaster
root@saltmaster:~# grep hosts /etc/nsswitch.conf
hosts:          files myhostname dns
root@saltmaster:~# time salt-call --local grains.item fqdn_ip4 fqdn_ip6
local:
    ----------
    fqdn_ip4:
        - 127.0.0.1
    fqdn_ip6:
        - ::1

real	0m0.299s
user	0m0.217s
sys	0m0.074s
root@saltmaster:~# vi /etc/hosts
root@saltmaster:~# cat /etc/hosts
127.0.0.1 localhost saltmaster.local saltmaster
root@saltmaster:~# time salt-call --local grains.item fqdn_ip4 fqdn_ip6
[WARNING ] Unable to find IPv6 record for saltmaster.local. Create a dns record or add to /etc/hosts to clear this message.
local:
    ----------
    fqdn_ip4:
        - 127.0.0.1
    fqdn_ip6:

real	0m10.323s
user	0m0.214s
sys	0m0.066s
root@saltmaster:~# vi /etc/hosts
root@saltmaster:~# cat /etc/hosts
root@saltmaster:~# time salt-call --local grains.item fqdn_ip4 fqdn_ip6
local:
    ----------
    fqdn_ip4:
        - 192.168.50.10
        - 10.0.2.15
    fqdn_ip6:
        - ::1

real	0m0.310s
user	0m0.244s
sys	0m0.058s
root@saltmaster:~# vi /etc/nsswitch.conf
root@saltmaster:~# grep hosts /etc/nsswitch.conf
hosts:          files dns
root@saltmaster:~# time salt-call --local grains.item fqdn_ip4 fqdn_ip6
[WARNING ] Unable to find IPv4 record for saltmaster. Create a dns record or add to /etc/hosts to clear this message.
[WARNING ] Unable to find IPv6 record for saltmaster. Create a dns record or add to /etc/hosts to clear this message.
local:
    ----------
    fqdn_ip4:
    fqdn_ip6:

real	0m0.343s
user	0m0.186s
sys	0m0.110s
```
2017-03-24 14:04:41 -05:00
Mike Place
4928026253 Merge pull request #40308 from rallytime/bp-38835
Back-port #38835 to 2016.11
2017-03-24 13:00:45 -06:00
Mike Place
be73d61551 Merge pull request #40307 from s0undt3ch/develop
System encoding detection compatibility for windows
2017-03-24 12:58:40 -06:00
rallytime
2a483a256a Move "redis" to "redis_cache" references in docs to allow redis_cache docs to build 2017-03-24 12:36:31 -06:00
David Boucha
3ba50d3c52 add info about what is cached 2017-03-24 11:49:26 -06:00
David Boucha
77e8f6aff9 fix config example 2017-03-24 11:49:26 -06:00
David Boucha
61f2fa9339 Add documentation for the Minion data cache
Includes docs for localfs and consul minion data cache modules
2017-03-24 11:49:26 -06:00
Pablo Suárez Hernández
9174e6f281 Fixes testing opts dict for batch unit tests 2017-03-24 17:22:57 +00:00
Pedro Algarvio
b8d869bc88
System encoding detection compatibility for windows 2017-03-24 17:16:17 +00:00
Mike Place
9cdc517c44 Merge pull request #40298 from qluo1/fix_schedule_purge
Fix issue-40243: schedule.purge only purge single job
2017-03-24 11:08:26 -06:00
rallytime
f1352fe253 Add one more dockerng.version mock that was missed previously 2017-03-24 10:57:12 -06:00
Nicole Thomas
12a9fc43c9 Merge pull request #40287 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-24 10:50:22 -06:00
Nicole Thomas
aa0b36a66a Merge pull request #40301 from mirceaulinic/patch-6
Netconfig added in Nitrogen not 2016.11.1
2017-03-24 10:49:39 -06:00
David Murphy
b53a95dab1 Further update to us in similar to review comments 2017-03-24 10:08:02 -06:00
Vitali Quiering
91f2963922 Add logstash engine protocol to manual 2017-03-24 17:03:22 +01:00
Vitali Quiering
250a0b5ab4 Add logstash engine protocol to engines doc 2017-03-24 17:01:38 +01:00
David Murphy
59c0bdc14d Updated for review comments 2017-03-24 10:00:38 -06:00
Vitali Quiering
129015b4a4 Add ip protocol to logstash engine 2017-03-24 16:38:27 +01:00
Mircea Ulinic
07a8645611 Add NAPALM section in Nitrogen release notes 2017-03-24 13:22:38 +00:00
Mircea Ulinic
ab8bc6d015 Netconfig added in Nitrogen not 2016.11.1 2017-03-24 13:09:46 +00:00
Mircea Ulinic
423dda9149 Strip include from append_minionid_config_dirs, leave only default_include 2017-03-24 12:30:12 +00:00
Pablo Suárez Hernández
b1de79abcf Adds custom 'timeout' and 'gather_job_timeout' to 'local_batch' client
Fixes 'local_batch' client to be aware of 'timeout' and 'gather_job_timeout' parameters that are coming from kwargs.
2017-03-24 12:23:12 +00:00
qluo1
b4ade181ef Fix issue-40243: schedule.purge only purge single job
return result too early in the purge loop.

https://github.com/saltstack/salt/issues/40243
2017-03-24 22:27:09 +11:00
vnitinv
146f8abc4c sync with upstream 2017-03-24 12:18:14 +05:30
Nitin Kr
507c553c0e Merge pull request #21 from rajvidhimar/salt_test
Remove usage of nose in junos unit tests
2017-03-24 11:43:32 +05:30
Anthony Shaw
10c84303db
fix unit tests 2017-03-24 15:13:03 +11:00
Tyler Goodlet
8bfa8e0d15 Document qcow support 2017-03-23 23:36:32 -04:00
Anthony Shaw
605a12dbc0
linting 2017-03-24 14:05:19 +11:00
Mircea Ulinic
14923b6fde Adding proxy module changes under Nitrogen release notes 2017-03-24 01:55:48 +00:00
Mircea Ulinic
a0a2f60961 Note proxy_merge_grains_in_module 2017-03-24 01:55:48 +00:00