Commit Graph

86856 Commits

Author SHA1 Message Date
Mike Place
6c3a500beb Merge pull request #44060 from The-Loeki/doc-roster
doc fixes for salt-ssh roster(s) opts
2017-10-16 14:12:40 -06:00
Mike Place
4d13e1961f Merge pull request #44119 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 25
2017-10-16 13:07:02 -06:00
Nicole Thomas
96dc6b0171 Merge pull request #44015 from gtmanfred/develop
convert jinja context to dictionary
2017-10-16 14:39:29 -04:00
Nicole Thomas
b13e129c6b Merge pull request #44117 from sahama/patch-1
show_all remove
2017-10-16 14:29:57 -04:00
Nicole Thomas
413de95df2 Merge pull request #44103 from terminalmage/salt.utils
Complete the salt.utils refactor
2017-10-16 14:12:50 -04:00
Mike Place
33bf0e1733 Merge pull request #44091 from quinot/bug/clustershell-host-addr-confusion
Confusion between host name and address
2017-10-16 10:25:01 -06:00
rallytime
7d21d4253a
Reduce the number of days an issue is stale by 25 2017-10-16 10:30:45 -04:00
Sayyid Hamid Mahdavi
be94aca2c3 show_all remove
show_all=True,  removed from beacon execution module so it should remove here also
2017-10-16 15:16:33 +03:30
Erik Johnson
877abb89d0
Complete the salt.utils refactor
This moves the remaining 30 functions from salt.utils to new locations.
2017-10-15 09:43:31 -05:00
Nicole Thomas
78e46b3a68 Merge pull request #44075 from terminalmage/salt.utils.files
Move 14 more functions from salt.utils
2017-10-13 14:56:12 -04:00
Nicole Thomas
76cc5ba689 Merge branch 'develop' into develop 2017-10-13 11:44:17 -04:00
Thomas Quinot
4ab5d5d390 Confusion between host name and address
Keys in target dict are host names (as expanded by clustershell),
not addresses.
2017-10-13 16:34:49 +02:00
Nicole Thomas
b617c85519 Merge pull request #44084 from senthilkumar-e/doc_update
Fixing a typo in the troubleshooting document
2017-10-13 10:29:50 -04:00
Erik Johnson
2d4d8fa9c8
Convert "Can be removed" lines into TODO lines 2017-10-13 09:29:03 -05:00
Erik Johnson
c6b655b6e9
Move 14 more functions from salt.utils
These functions are:

salt.utils.test_mode -> salt.utils.args.test_mode
salt.utils.split_input -> salt.utils.args.split_input
alt.utils.pem_finger -> salt.utils.crypt.pem_finger
salt.utils.is_bin_file -> salt.utils.files.is_binary
salt.utils.list_files -> salt.utils.files.list_files
salt.utils.safe_walk -> salt.utils.files.safe_walk
salt.utils.st_mode_to_octal -> salt.utils.files.st_mode_to_octal
salt.utils.normalize_mode -> salt.utils.files.normalize_mode
salt.utils.human_size_to_bytes -> salt.utils.files.human_size_to_bytes
salt.utils.get_hash -> salt.utils.hashutils.get_hash
salt.utils.is_list -> salt.utils.data.is_list
salt.utils.is_iter -> salt.utils.data.is_iter
salt.utils.isorted -> salt.utils.data.sorted_ignorecase
salt.utils.is_true -> salt.utils.data.is_true
2017-10-13 09:29:03 -05:00
Nicole Thomas
0238a6d713 Merge pull request #44061 from Shinzu/develop
Add option to eagerly scrub the disk
2017-10-13 09:57:02 -04:00
Nicole Thomas
b63293cae2 Merge pull request #44063 from netzmacher/develop
modules elbv2 fix
2017-10-13 09:51:13 -04:00
Senthilkumar Eswaran
238941cd02 Fixing a typo in the troubleshooting document 2017-10-12 22:28:25 -07:00
Charlie Root
4fe49007a3
Merge branch 'develop' of https://github.com/netzmacher/salt into develop 2017-10-13 07:26:49 +02:00
Charlie Root
eec6a0bb2c
Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-10-13 07:26:31 +02:00
Charlie Root
07bd44e490
boto_elbv2 fix 2017-10-13 07:25:57 +02:00
Mike Place
e60c40398b Merge pull request #44074 from SaltyCharles/patch-9
fix typo in set_volume_tags documentation
2017-10-12 17:32:09 -06:00
SaltyCharles
e5b8953fc0 fix typo in set_volume_tags documentation 2017-10-12 11:41:50 -07:00
Markus
820add5551
Added version tag 2017-10-12 20:30:55 +02:00
Sven R
20ca371c4e Merge branch 'develop' into develop 2017-10-12 20:18:51 +02:00
Nicole Thomas
c7a22cb9fd Merge pull request #44047 from terminalmage/salt.utils.network
Move 5 functions from salt.utils
2017-10-12 14:09:18 -04:00
Charlie Root
1789ca93f9
boto_elbv2 fix 2017-10-12 19:42:35 +02:00
Nicole Thomas
b89d681327 Merge pull request #44017 from dis-xcom/develop
Fix issue with mutable 'virt:disk' object
2017-10-12 11:48:07 -04:00
Nicole Thomas
5166b1f5b8 Merge pull request #44002 from rawkode/feature/add-requests-warning
Adding requirement for requests 2.4.2 when using Vault module
2017-10-12 11:42:46 -04:00
Nicole Thomas
18dfc1967d Merge pull request #43849 from kkoch986/develop
Add support for tagging newly created DigitalOcean droplets.
2017-10-12 11:35:29 -04:00
Erik Johnson
1e2e2b6ac5
Move 5 functions from salt.utils
These functions are:

- salt.utils.ip_bracket -> salt.utils.zeromq.ip_bracket
- salt.utils.gen_mac -> salt.utils.network.gen_mac
- salt.utils.mac_str_to_bytes -> salt.utils.network.mac_str_to_bytes
- salt.utils.refresh_dns -> salt.utils.network.refresh_dns
- salt.utils.dns_check -> salt.utils.network.dns_check
2017-10-12 09:07:00 -05:00
Nicole Thomas
4dbbc38a12 Merge pull request #43989 from terminalmage/salt.utils.process
Move 4 functions from salt.utils
2017-10-12 09:48:54 -04:00
Charlie Root
bc17787c9d
modules elbv2 fix 2017-10-12 14:30:33 +02:00
Markus Wyrsch
911ee5f361
Add option to eagerly scrub the disk 2017-10-12 13:43:27 +02:00
Ronald van Zantvoort
e555b6351b doc fixes for salt-ssh roster(s) opts 2017-10-12 11:42:23 +02:00
Ken Koch
ecda3277d3 Merge branch 'develop' of github.com:kkoch986/salt into develop 2017-10-11 21:14:36 -04:00
Ken Koch
067d4a5dd2 change tags to list based in config 2017-10-11 21:14:27 -04:00
Dennis Dmitriev
a7108ff003
Fix issue with mutable 'virt:disk' object
Images stored in 'virt:disk:<profile>:image' , if exist, have
higher priority than 'image' argument for 'virt' module.

But if different nodes will use different images for the same disk
<profile> during the run, then the image used for the first node
will be re-used for all the rest because it is stored in the
mutable object.

Use copy.deepcopy to avoid such issue.
2017-10-12 02:30:41 +03:00
Mike Place
24b9f21456 Merge pull request #43831 from eradman/vmm_grain
Detect OpenBSD guest running under VMM(4)
2017-10-11 17:19:52 -06:00
Mike Place
3bc4dcec05 Merge pull request #43897 from ablinkinz/centurylinkcloud_provider
Adding Century Link Cloud Provider
2017-10-11 16:45:24 -06:00
Mike Place
4c2c1bee51 Merge pull request #43924 from kunal-bajpai/fix_id_cache
Create minion_id dirs if not exists
2017-10-11 16:43:25 -06:00
Erik Johnson
554c685ce5
Move 4 functions from salt.utils
- salt.utils.reinit_crypto -> salt.utils.crypt.reinit_crypto
- salt.utils.appendproctitle -> salt.utils.process.appendproctitle
- salt.utils.daemonize -> salt.utils.process.daemonize
- salt.utils.daemonize_if -> salt.utils.process.daemonize_if
2017-10-11 14:49:50 -05:00
Nicole Thomas
2f64837de3 Merge pull request #44049 from terminalmage/fix-warning
Fix bad copypasta in warning message
2017-10-11 15:16:02 -04:00
Erik Johnson
d3d76c79ca
Fix bad copypasta in warning message 2017-10-11 14:12:51 -05:00
Nicole Thomas
1e4dec5402 Merge pull request #43053 from DSRCorporation/bugs/43003_group_syndic_develop
Group minion events in Syndic.
2017-10-11 13:35:37 -04:00
Nicole Thomas
88c00ea198 Merge branch 'develop' into bugs/43003_group_syndic_develop 2017-10-11 13:35:16 -04:00
Daniel Wallace
41c086faf7
convert jinja context to dictionary
For `show_full_context`, it is useful to have this as a serializable dictionary so that it can be dumped and actually parsed using

`{{show_full_context|yaml(False)}}`
2017-10-11 10:24:34 -06:00
Nicole Thomas
3a078304d8 Merge pull request #43982 from terminalmage/salt.utils.data
Move 13 functions from salt.utils to salt.utils.data
2017-10-11 11:42:08 -04:00
garethgreenaway
aae062deeb Merge pull request #44022 from garethgreenaway/mount_state_module_fix
[develop] Fix to mount state module
2017-10-11 08:27:06 -07:00
garethgreenaway
e30c797d9b Merge pull request #43600 from vernondcole/vagrant-module
Vagrant module
2017-10-10 21:20:14 -07:00