Commit Graph

70725 Commits

Author SHA1 Message Date
Nicole Thomas
4526fc6e08 Merge pull request #39929 from terminalmage/pr-39770-2016.3
Scrap event-based approach for refreshing grains (2016.3 branch)
2017-03-09 15:03:15 -07:00
Erik Johnson
cf0100dabe Scrap event-based approach for refreshing grains
The call to refresh_modules() in saltutil.refresh_grains was resulting
in a race condition with the event I added to refresh the grains. This
meant that, even though self.opts['grains'] was being changed by the new
event, before that process could finish the module refresh was itself
re-loading the grains and re-packing these new grains into the
__grains__ dunder, negating the refresh.

Since the module refresh loads the grains anyway, this commit changes
saltutil.refresh_grains to refresh the modules. It also removes the
refresh argument recently added to the grains module functions, as we're
no longer using it to conditionally refresh modules.
2017-03-09 13:24:01 -06:00
Nicole Thomas
111110caf8 Merge pull request #39919 from The-Loeki/patch-1
CIDR matching supports IPv6, update docs
2017-03-09 09:02:59 -07:00
Ronald van Zantvoort
170cbadc54 CIDR matching supports IPv6, update docs
After #22080 IPv6 CIDR matching is supported & functional, docs should('ve) reflected that since 2015.8
2017-03-09 13:52:13 +01:00
Nicole Thomas
caf10e9988 Merge pull request #39899 from techhat/cleanupdisks
Update cleanup function for azure
2017-03-08 16:28:32 -07:00
Joseph Hall
baf4579e63 Update cleanup function for azure 2017-03-08 10:19:06 -07:00
Mike Place
fcf95f3654 Merge pull request #39871 from terminalmage/squelch-import-warning
Squelch warning for pygit2 import
2017-03-07 13:40:17 -07:00
Erik Johnson
2b2ec69d04 Squelch warning for pygit2 import
RedHat updated cffi for RHEL/CentOS 7.3, which causes a pair of warnings
on the pygit2 import. This warning is spit out to the CLI on several
commands, when they result in the git fileserver backend to be loaded.

This commit squelches that warning as it is just noise. Upgrading
pygit2/libgit2 would solve this, but that is not likely to happen in
RHEL/CentOS 7.
2017-03-07 09:31:43 -06:00
Mike Place
d46845a5b6 Add newline at end of file
Needed for lint
2017-03-06 20:54:53 -07:00
Tomas Zvala
d4a3c8a66a Use regular expression instead of split when replacing authorized_keys
In some cases (e.g. Ubuntu cloud-init) authorized_keys may contain quoted spaces as part of options:
`no-port-forwarding,no-agent-forwarding,no-X11-forwarding,com‌​mand="echo 'Please login as the user \"ubuntu\" rather than the user \"root\".';echo;sleep 10" ssh-rsa xxxxxx`
which confused the split in _replace_auth_key() in modules/ssh.py.
2017-03-06 18:36:04 +01:00
Mike Place
f223fa8906 Merge pull request #39794 from cachedout/clean_monitor_socket_shutdown
Clean up errors which might be thrown when the monitor socket shuts down
2017-03-04 09:12:37 -07:00
Mike Place
4002dc1947 Merge pull request #39819 from terminalmage/top-file-matching-docs
Improve the Top File matching docs
2017-03-04 09:06:39 -07:00
Mike Place
c08aaeb7fd Merge pull request #39820 from ni3mm4nd/beacons_topic_doc_typo
Add missing apostrophe in Beacons topic documentation
2017-03-04 09:05:28 -07:00
Mike Place
cbd2a4e3cc Merge pull request #39826 from cachedout/yubikey_fix
Add group func to yubikey auth
2017-03-04 09:02:13 -07:00
Mike Place
6125eff02d
Add group func to yubikey auth
Because we don't support groups with yubikeys (and can't, in fact)
we need to dummy up this to always return false. This allows individual
user auths to work, whereas they would fail prior to this change.
2017-03-03 16:46:24 -07:00
Jan Kadlec
804b12048c Add missing apostrophe 2017-03-03 17:58:53 +01:00
Erik Johnson
7178e77eee Improve the Top File matching docs
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
2017-03-03 10:40:22 -06:00
Mike Place
f575ef459f Merge pull request #39624 from drawsmcgraw/39622
Address issue 39622
2017-03-03 08:59:03 -07:00
Pedro Algarvio
1f3619c1e5 Merge pull request #39796 from cachedout/master_shutdown
Stop the process manager when it no longer has processes to manage
2017-03-02 23:03:12 +00:00
Mike Place
e31d46c1b8
Stop the process manager when it no longer has processes to manage 2017-03-02 14:45:57 -07:00
Mike Place
2e683e788b
Clean up errors which might be thrown when the monitor socket shuts down 2017-03-02 13:27:32 -07:00
Mike Place
53341cf152 Merge pull request #39791 from gtmanfred/2016.3
load runners if role is master
2017-03-02 12:43:41 -07:00
Daniel Wallace
3ab4f843bf load runners if role is master 2017-03-02 12:05:52 -06:00
Mike Place
c234c25092 Merge pull request #39784 from sergeizv/fix-39782
Fix 39782
2017-03-02 09:08:50 -07:00
Sergei Zviagintsev
b71c3fe13c Revert "cloud.clouds.ec2: cache each named node (#33164)"
This reverts commit b3805d825a ("cloud.clouds.ec2: cache each named
node (#33164)").

Commit 25771fc030 ("_get_node return instance info directly, not a
dict of instances") from 2016.3 feature release changed how the result
of _get_node should be interpreted. Before it was like

  res = _get_node(...)
  node = res[name]

and after the commit it became

  node = _get_node(...)

Commit b3805d825a ("cloud.clouds.ec2: cache each named node (#33164)")
submitted into 2015.8 as a bugfix for #33162 added loops over the keys
of a dictionary returned by _get_node, fixing
salt.utils.cloud.cache_node calls in queue_instances() and
show_instance().

But after being merged into 2016.3 with merge commit 679200aeb2
("Merge branch '2015.8' into '2016.3'"), the commit in question
reintroduced the bug on 2016.3 because of changed return value of
_get_node.

Fixes #39782
2017-03-02 12:42:24 +01:00
Mike Place
4ee59be22c Merge pull request #39766 from rallytime/fix-ipv6-connection
Restore ipv6 connectivity and "master: <ip>:<port>" support
2017-03-01 19:55:54 -07:00
rallytime
65b239664e Restore ipv6 connectivity and "master: <ip>:<port>" support 2017-03-01 14:15:07 -07:00
Mike Place
a24da31131 Merge pull request #39761 from cachedout/issue_33187
Properly display error in jboss7 state
2017-03-01 11:43:22 -07:00
Mike Place
c2df29edb2
Properly display error in jboss7 state
Refs #33187
2017-03-01 09:27:07 -07:00
Nicole Thomas
0888bc32ef Merge pull request #39728 from rallytime/update-release-ver-2016.3
[2016.3] Bump latest release version to 2016.11.3
2017-02-28 11:07:43 -07:00
rallytime
c9bc8af8f2 [2016.3] Bump latest release version to 2016.11.3 2017-02-28 09:01:24 -07:00
Mike Place
b52dbeec68 Merge pull request #39619 from terminalmage/zd1207
Add a function to simply refresh the grains
2017-02-27 17:20:26 -07:00
Erik Johnson
c7dfb494a6 Fix mocking for grains refresh 2017-02-25 21:04:48 -06:00
Erik Johnson
7e0ced3b45 Properly hand proxy minions
The proxy argument to salt.loader.grains expects a reference to a
salt.loader.proxy loader instance, not a bool. Thanks @cro!
2017-02-25 21:04:48 -06:00
Erik Johnson
692c456da3 Add a function to simply refresh the grains
Also use this function to refresh the grains when editing them using
grains.{delval,setval,setvals}, avoiding a full sync. This speeds up
these functions by skipping the syncing of custom grains modules. For
most use cases, walking all your fileserver environments (which could be
a lot if using gitfs) is unnecessary when you're simply using these
functions to add/remove grains from /etc/salt/grains.
2017-02-25 21:04:48 -06:00
Mike Place
3f8b5e6733 Merge pull request #39487 from bobrik/mode-docs
Document default permission modes for file module
2017-02-24 16:49:00 -07:00
Mike Place
f7389bf1f5 Merge pull request #39641 from smarsching/issue-39169-2016.3
Return runner return code in a way compatible with check_state_result
2017-02-24 16:07:10 -07:00
Nicole Thomas
fc970b6a16 Merge pull request #39633 from terminalmage/fix-systemd-typo
Fix misspelled argument in salt.modules.systemd.disable()
2017-02-24 11:21:35 -07:00
Sebastian Marsching
88c2d9a540 Fix return data structure for runner (issue #39169).
Previously, the return code of the runner (if any) was supplied in
ret['data']['retcode']. This was problematic if ret['data'] was later processed
by check_state_result. With this change, runners return the optional return
code in ret['retcode'], like the other code (modules, etc.) already did before.
2017-02-24 13:02:52 +01:00
Erik Johnson
ca54541abe Add missing unit test for disable func 2017-02-24 01:12:42 -06:00
Erik Johnson
17109e1522 Fix misspelled argument in salt.modules.systemd.disable() 2017-02-24 01:09:51 -06:00
Erik Johnson
53e78d67f6 Merge pull request #39613 from terminalmage/fix-docs
Fix inaccurate documentation
2017-02-24 00:07:34 -06:00
Ivan Babrou
41ef69b3ca
Document default permission modes for file module 2017-02-23 19:36:24 -08:00
Drew Malone
13da50be33 Fix indention lint errors 2017-02-23 18:40:52 -05:00
Drew Malone
545026352f Address issue 39622 2017-02-23 18:10:11 -05:00
Erik Johnson
9342eda377 Fix inaccurate documentation
The refresh argument does not do what was documented here. This fixes
that inaccuracy.
2017-02-23 13:42:19 -06:00
Nicole Thomas
4e2b852f83 Merge pull request #39600 from vutny/state-file-docs
state.file: drop non-relevant examples for `source_hash` parameter
2017-02-23 09:55:26 -07:00
Mike Place
ed83420417 Merge pull request #39584 from cachedout/mentionbot_docs
A note in the docs about mentionbot
2017-02-23 08:12:13 -07:00
Denys Havrysh
9b0427c27a state.file: drop non-relevant examples for source_hash parameter 2017-02-23 17:02:09 +02:00
Mike Place
652044b18f
A note in the docs about mentionbot 2017-02-22 19:34:02 -07:00