Commit Graph

77182 Commits

Author SHA1 Message Date
Erik Johnson
44598617be Merge pull request #41283 from terminalmage/bp-41251
Backport #41251 to 2016.11
2017-05-16 13:01:17 -05:00
abednarik
ed03ca534f Update apt module regarding upgrade against hold packages.
Fixes #41231 and related to #30777.
2017-05-16 13:00:05 -05:00
Bo Maryniuk
5168ef8959 Add unit test for hostname can be started from 127 2017-05-16 16:18:14 +02:00
Bo Maryniuk
0d0354198b Harden to 127. IP part 2017-05-16 16:17:26 +02:00
Bo Maryniuk
d9c8324a6b Unit test for accepting hosts names as 127 2017-05-16 12:07:32 +02:00
Bo Maryniuk
65b03c667b Bugfix: unable to use 127 as hostname 2017-05-16 12:06:51 +02:00
Erik Johnson
d8e9676fcf Merge pull request #41181 from gtmanfred/2016.11
add resolving extra flags to yum upgrade
2017-05-15 23:07:46 -05:00
Daniel Wallace
2ca71713b1 use six and clean_kwargs 2017-05-15 12:23:58 -06:00
Daniel Wallace
c9bf09a5a1 add resolving extra flags to yum upgrade 2017-05-15 12:22:45 -06:00
Nicole Thomas
75942235f0 Merge pull request #41220 from rallytime/bp-40246
Back-port #40246 to 2016.11
2017-05-15 11:59:38 -06:00
Mike Place
53d5b3e816 Merge pull request #41244 from cachedout/fix_ipv6_nameserver_grains
Fix ipv6 nameserver grains
2017-05-15 12:55:38 -05:00
Mike Place
895fe582eb Merge pull request #41242 from M2Mobi/mysql_socket_auth
Fix changing a mysql user to unix socket authentication.
2017-05-15 12:00:06 -05:00
Mike Place
50d8fde123 Merge pull request #41101 from terminalmage/issue40940
Fix "latest" keyword for version specification when used with aggregation
2017-05-15 11:52:35 -05:00
Mike Place
f745db1a43
Lint 2017-05-15 09:21:38 -06:00
Mike Place
6e1ab69710
Partial revert of #40934
This reverts most of #40934. The only thing that should have been fixed there was the spurious warning message.

The logic in calculating which nameserver grains is not correct. It merely overwrites what is returned by
salt.utils.dns.parse_resolv instead of choosing what to include.

As a result of that error, in the case where ipv6 is exempted, we don't string-ify the nameserver in the
list comprehension, which in term passes a non-parseable object to the msgpack serializer which results
in a totally broken minion.

I chose not to fix the logic in the block mentioned above because in doing so, we'd remove other items
from the dictionary which are already present which could break some users. We'll have to carefully evaluate
how to accomplish this going forward.
2017-05-15 09:15:49 -06:00
Mike Place
88f49f9146
Revert "Only display IPvX warning if role is master"
This reverts commit 7855cd6ce6.
2017-05-15 09:13:30 -06:00
Heinz Wiesinger
7d8359766d Fix changing a mysql user to unix socket authentication. 2017-05-15 16:09:02 +02:00
Benoît Knecht
33211d032e states: cron: show correct changes when using special
When using the `cron.present` state with the `special` keyword:

  /path/to/cron/script:
    cron.present:
      - user: root
      - special: '@hourly'

and running Salt in test mode, Salt would always report changes, even
when nothing needed to be changed.

This commit actually checks if changes are needed when using the
`special` keyword.
2017-05-15 10:21:39 +02:00
Evgeny Akhmetkhanov
76104f23b4 Add basic auth for SPM 2017-05-14 15:32:55 +03:00
rallytime
79f1bb2bba Remove unused/duplicate imports leftover from merge-conflict resolution 2017-05-12 17:47:18 -06:00
Anthony Shaw
2f610680e5 remove unused imports 2017-05-12 16:38:30 -06:00
Anthony Shaw
9b7de2e7d7 fix unit tests 2017-05-12 16:37:26 -06:00
Anthony Shaw
49d94559ab linting 2017-05-12 16:36:07 -06:00
Anthony Shaw
4b260a4594 linting 2017-05-12 16:36:07 -06:00
Anthony Shaw
41d1adab5f fix up tests 2017-05-12 16:36:06 -06:00
Anthony Shaw
b3822e03fc add fixes for incorrectly importing modules directly instead of using __salt__ 2017-05-12 16:34:49 -06:00
Erik Johnson
7fe64219ae Add rtag check to integration test for pkg.refresh_db 2017-05-12 15:21:22 -05:00
C. R. Oldham
19db038b99 Fix test--use proxy_config instead of minion_config 2017-05-12 14:01:54 -06:00
Erik Johnson
88a08aa3bf Add comments to explain what removing the rtag file actually does 2017-05-12 14:50:46 -05:00
Mike Place
049712ba53 Merge pull request #41146 from terminalmage/backport-get_tree-performance-improvement
gitfs: Backport performance fixes for getting tree objects
2017-05-12 12:35:46 -05:00
Mike Place
4215a0b99d Merge pull request #41161 from The-Loeki/2016.11
gpg renderer: fix gpg_keydir always reverting to default
2017-05-12 12:19:06 -05:00
Mike Place
5b10fc58ba Merge pull request #41163 from onlyanegg/elasticsearch-pass_profile_to_index_exists
Elasticsearch - pass hosts and profile to index_exists()
2017-05-12 12:18:05 -05:00
Mike Place
d433cf850d Merge pull request #41186 from jmarinaro/fix-chocolatey-package-collision
Fix package name collisions in chocolatey state
2017-05-12 12:01:30 -05:00
Mike Place
bb5ef41ce0 Merge pull request #41189 from github-abcde/utils-minions-fix
utils/minions.py: Fixed case where data is an empty dict resulting in…
2017-05-12 11:32:24 -05:00
Piotr Kaźmierczak
5f952007f6 Fix: zypper handling of multiple version packages
For kernel packages, zypper reports multiple versions as "new" during
upgrade. Thus, a salt state requesting pkg.latest of any kernel package
would fail, even though zypper runs successfully. This commit provides
a simple fix.
2017-05-12 10:36:12 +02:00
C. R. Oldham
7749ceadb6 Change default proxy minion opts so only the proxy-specific ones are
listed, and the rest are taken from DEFAULT_MINION_OPTS.
2017-05-11 15:09:27 -06:00
jmarinaro
229f3bf9f3 apply changes to uninstalled function
Fixes #41185
2017-05-11 11:25:46 -06:00
herbert.buurman
853dc5406c utils/minions.py: Fixed case where data is an empty dict resulting in errors. 2017-05-11 10:57:34 +02:00
jmarinaro
ffd4c7ef04 Fix package name collisions in chocolatey state
Fixes #41185
2017-05-10 19:44:24 -06:00
Nicole Thomas
b136b15330 Merge pull request #41104 from Ch3LL/add_jobs_test
Add test to query results of /jobs call in api
2017-05-10 14:11:07 -06:00
Nicole Thomas
ca18b4df93 Merge pull request #41170 from lomeroe/bp-41081
Backport #41081 to 2016.11
2017-05-10 13:58:52 -06:00
Nicole Thomas
d7ec37b003 Merge pull request #41173 from twangboy/fix_installer
Add silent action to MsgBox for Path Actions
2017-05-10 13:57:05 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
twangboy
96918dcfa6 Add silent action to MsgBox for Path Actions 2017-05-10 11:22:18 -06:00
Ch3LL
dac16583b7
add test to query results of /jobs call in api 2017-05-10 12:39:17 -04:00
lomeroe
2af89f2165 update mock data 2017-05-10 10:33:34 -05:00
lomeroe
b7fa115a59 update win_dns_client tests with correct module names 2017-05-10 10:33:33 -05:00
lomeroe
4d05a22675 Update win_dns_client to use reg.read_value and set_value 2017-05-10 10:33:31 -05:00
coutotyler
7f512c701b Pass hosts and profile to index_exists() method 2017-05-09 18:11:12 -07:00
Ronald van Zantvoort
24946fef18 gpg renderer: fix gpg_keydir always reverting to default 2017-05-10 00:42:52 +02:00