Commit Graph

84364 Commits

Author SHA1 Message Date
Nicole Thomas
e5a1401b82
Merge pull request #44712 from Ch3LL/ssh_pillar_items
Add pillar ssh integration tests
2017-11-30 10:29:32 -05:00
Nicole Thomas
2e1c946990
Merge pull request #44763 from cloudflare/thorium-doc
Just a small improvement to the Thorium documentation
2017-11-30 09:38:03 -05:00
Nicole Thomas
8ba2df1ea0
Merge pull request #44531 from cloudflare/deprecate-napalm-tpl
Add deprecation notes for the NAPALM native templates
2017-11-30 09:18:55 -05:00
Mircea Ulinic
f8d69dd0ba
Add thorium_roots configuration example 2017-11-30 12:50:29 +00:00
Mircea Ulinic
4610fb4e62
thorium_roots not thorium_roots_dir 2017-11-30 12:48:17 +00:00
Denys Havrysh
d1f247e49e
Add basic unit tests for schedule util eval func 2017-11-30 12:43:52 +02:00
Denys Havrysh
6ff8e75ac6
Fix #44583: splay with cron-like scheduled jobs
Try to add "splay" time only if next job fire time is
still in the future for cron and other type of schedules.
2017-11-30 12:43:51 +02:00
Mircea Ulinic
655139d01c
Different path to the static grains file when running under a proxy minion
Similarly to the changes from #44549, we need to look under in a different
location when saving the static grains, so the grain file is, e.g.,
/etc/salt/proxy.d/{id}/grains.
This solves #42300.
2017-11-30 10:34:27 +00:00
Mircea Ulinic
3eec8dbc63
Dummy proxy: catch EOFError instead of IOError
This is due to the changes from #44551, when the dummy proxy module
is using salt.utils.files.mkstemp.
2017-11-30 10:31:04 +00:00
Gareth J. Greenaway
7f0ff5a8b0
When passing IDs on the command line convert them all the strings for later comparision. 2017-11-29 14:18:33 -08:00
Nicole Thomas
7bde48282e
Merge pull request #44737 from twangboy/win_skip_test_ipc
Skip `unit.transport.test_ipc` for Windows
2017-11-29 14:18:20 -05:00
Nicole Thomas
c5206113ce
Merge pull request #44629 from Ch3LL/high_masterless
Add masterless state.highstate integration test
2017-11-29 14:05:22 -05:00
Daniel Wallace
eefcfc719c
use a copy so roster_defaults doesn't mangle
The minion information is getting mangled if the roster_defaults is set
2017-11-29 11:46:08 -07:00
Georges Racinet
6806d83314
Merge branch '2017.7' into 42713_backport_2017.7 2017-11-29 19:00:38 +01:00
twangboy
4e0359b603
Skip IPC transport tests in Windows, not supported 2017-11-29 09:19:51 -07:00
Georges Racinet
fb586c6dce
Backported issue #42713 to 2017.7
Cherry-picked and squashed the two commits from the develop branch
(details at the end of this message)

The unit test module didn't exist at all on 2017.7, hence a conflict during
cherry picking, resolved by introducing only the new tests (the other ones
don't pass as is on 2017.7)

Also, the mock in unit tests for mine.get had to be adapted,
because the return of salt.utils.minions.CkMinions._check_compound_minions()
takes a different form on 2017.7 (just the list of minions).

Original cherry-picked commits:

commit 115ebef6a089dedf8dbadd3b4cca768adbb4a710
Author: Georges Racinet <gracinet@anybox.fr>
Date:   Wed Nov 8 18:02:29 2017 +0100

    Unit test for backwards compatibility of mine.get

    Could not find calls to RemoteFuncs in unit tests, therefore started a
    new one, hope it's in the appropriate place.

    The test replaces the caceh by its own (very limited) one. It's quite
    possible it could be improved by reusing another one meant for unit tests.

commit dc884478399355f3fbea8626a8366b933580dee0
Author: Georges Racinet <gracinet@anybox.fr>
Date:   Mon Oct 30 13:49:13 2017 +0100

    Backwards compat for mine.get on pre-Nitrogen minions

    With this change, the master will accept `expr_form` from
    its minions doing a `mine.get`, which is what minions versions
    before Nitrogen would do. This solves issue #42713.

    In case both `tgt_type` and `expr_form` are present, the former
    gets precedence.

    Performance-wise, this adds a single dict lookup for minions
    running Nitrogen onwards, and two for pre-Nitrogen minions.
    This is, in my opinion, acceptable.
2017-11-29 16:17:52 +01:00
Ch3LL
9b7421b261
Change check to the state id 2017-11-29 10:15:56 -05:00
Ch3LL
9cc853e3d5
Add masterless state.highstate integration test 2017-11-29 10:15:56 -05:00
Nicole Thomas
2dc3e5c42a
Merge pull request #44613 from Ch3LL/pillar_masterless
Add pillar.items test for masterless
2017-11-29 09:43:10 -05:00
Nicole Thomas
cc05481026
Merge pull request #44659 from Ch3LL/ssh_sls_id
Add state.sls_id to ssh wrapper and tests
2017-11-29 09:41:47 -05:00
Nicole Thomas
97ec0e6ea0
Merge branch '2017.7' into ssh_pillar_items 2017-11-29 09:39:38 -05:00
Thomas Phipps
4b11f8d66d
add quick documentation suggesting systemd-run --scope if using cmd.run_bg with systemd 2017-11-28 17:51:52 -07:00
Gareth J. Greenaway
642eed11e1
Merge pull request #44698 from Ch3LL/mine_ssh
Add salt-ssh mine.get integration test
2017-11-28 14:15:28 -08:00
Gareth J. Greenaway
998d714ee7
Merge pull request #44517 from whytewolf/publish_port_doc_missing
Publish port doc missing
2017-11-28 13:50:18 -08:00
Nicole Thomas
5d82df5667
Merge pull request #44697 from Ch3LL/show_top_test
Sort the show_top results for test_state_show_top test
2017-11-28 15:35:40 -05:00
Ollie Armstrong
3d85a260c4
Fix acme.cert to run certbot non-interactively
Certbot should never be running interactively when executed via Salt, so
this patch adds an argument to certbot which informs it to not run
interactively.

This fixes #42763.
2017-11-28 15:28:13 -05:00
Gareth J. Greenaway
99e436add4
When looking for job ids to remove based on the tag_name the comparision was comparing an INT to a STR, so the correct job id was not being returned. 2017-11-28 11:02:04 -08:00
Mike Place
9d43221422
Correct indentation 2017-11-28 13:56:25 -05:00
campbell
d6e28ebed1
Add handling for FreeBSD in method zone_compare to avoid exception when /etc/localtime file does is absent. This is valid configuration on FreeBSD and represents UTC. 2017-11-28 13:56:20 -05:00
Nicole Thomas
2c2e1e2332
Merge branch '2017.7' into pillar_masterless 2017-11-28 13:35:12 -05:00
rallytime
1bbe1abeb2
Allow --static option to display state runs with highstate output
Fixes #44556
2017-11-28 13:10:37 -05:00
Justin Findlay
5c34607f6c
utils/files remove temp file upon move failure
Fixes #31405.
2017-11-28 09:43:58 -08:00
Ch3LL
c7f5af1274
Add pillar ssh integration tests 2017-11-28 12:19:41 -05:00
Ch3LL
974db59dc1
convert the assert to a union set instead 2017-11-28 10:57:55 -05:00
Ch3LL
add43c4cfe
Sort the show_top results for test_state_show_top test 2017-11-28 10:43:45 -05:00
Nicole Thomas
f6a72acfe3
Merge branch '2017.7' into mine_ssh 2017-11-27 17:01:51 -05:00
Nicole Thomas
f2f6817e86
Merge pull request #44608 from Ch3LL/ssh_jinja
Add jinja to ssh sls test file
2017-11-27 17:00:27 -05:00
Ch3LL
9e67babf85
Add teardown to remove ssh dir 2017-11-27 16:51:02 -05:00
Ch3LL
f90b4f7653
Add salt-ssh mine.get integration test 2017-11-27 16:38:19 -05:00
Nicole Thomas
04b97bcfad
Merge pull request #44663 from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file
Update notes around grains topic, and salt.modules.grains and salt.state.grains
2017-11-27 16:33:37 -05:00
Nicole Thomas
6169b52749
Merge pull request #41279 from Ch3LL/add_grain_tests
Add fqdn and dns core grain tests
2017-11-27 16:28:09 -05:00
Nicole Thomas
364deee6ac
Merge pull request #44332 from cloudflare/improve-net-load
Improve the net.load_config execution function
2017-11-27 16:22:17 -05:00
Nicole Thomas
b6a1ed06b8
Merge pull request #44664 from mvivaldi/patch-1
Patch 1
2017-11-27 16:17:19 -05:00
Nicole Thomas
9ea4ee1479
Merge pull request #44549 from cloudflare/fix-proxy-grains
Allow proxy minions to load static grains
2017-11-27 15:57:08 -05:00
Nicole Thomas
5ec7ea0bb5
Merge pull request #44572 from Ch3LL/watchin_test
Add watch_in integration test
2017-11-27 15:52:31 -05:00
Thomas Phipps
c9122e4b85
fixed pylint error, and updated description on at the top the the module and state. 2017-11-27 11:08:12 -07:00
Daniel Wallace
c6733ac1ee
pop None
We don't want to error here, so if for some reason the key is not populated,
just return a None instead of erroring.
2017-11-27 10:04:23 -07:00
mvivaldi
4551999ec7
Update jinja.py
the name of the jinja filter is wrong in the documentation
2017-11-23 09:53:58 +01:00
mvivaldi
ae13d57307
Update file.py
the name of the jinja filter is wrong in the documentation
2017-11-23 09:47:24 +01:00
Thomas Phipps
7fb208b5ad
Update note in topics/grains to reflect that not all grains are ignored.
only those set in the minion config

also update header of salt.modules.grains to more closely match what
states says in regard to this.

and tweak the note portion to stand out a bit more.

tweaked the state note to also stand out more
2017-11-22 15:17:45 -08:00