Bo Maryniuk
8839f7219b
Add UT for matching all versions
2017-05-24 13:55:49 +02:00
Bo Maryniuk
5988e3b5d3
Fix a docstring
2017-05-24 13:55:49 +02:00
Bo Maryniuk
508c439b2b
Rename UT to a proper name
2017-05-24 13:55:49 +02:00
Bo Maryniuk
3b44018f58
Add unit test scaffold for wildcard support
2017-05-24 13:55:49 +02:00
Bo Maryniuk
4ae9ff2494
Add wildcard support initial class
2017-05-24 13:55:49 +02:00
Nicole Thomas
c09d4bb9ec
Merge pull request #41395 from rallytime/lint-develop
...
Add "KeyError" to bare except in azurearm
2017-05-23 13:28:11 -06:00
rallytime
2d5e6f8117
Add "KeyError" to bare except in azurearm
...
Fixes pylint, refs #41346 .
2017-05-23 12:14:36 -06:00
Mike Place
b43b89c5fa
Merge pull request #40713 from pgstenberg/feature-haproxyconnaddfunc
...
Additional functionality to the haproxy module
2017-05-22 12:11:32 -05:00
Mike Place
0f12bf8b44
Merge pull request #41009 from mitodl/develop
...
Added XML formatter to Jinja context
2017-05-22 12:07:42 -05:00
Mike Place
0e015cedea
Merge pull request #41243 from arif-ali/grafana_datasource_fix
...
Remove the keys that don't exist in the new change
2017-05-22 11:46:23 -05:00
Mike Place
455a42387d
Merge pull request #41321 from alexander-bauer/cryptdev
...
Add cryptdev state/module for manipulating /etc/crypttab and using cryptsetup
2017-05-22 11:28:34 -05:00
Mike Place
51f389ed21
Merge pull request #41325 from garethgreenaway/41263_rsync_additional_options
...
Passing additional options to rsync
2017-05-22 11:27:37 -05:00
Mike Place
38dab8febf
Merge pull request #41346 from shengis/azurerm_fix_multiple_providers
...
Fix #41299 list nodes in active provider only
2017-05-22 11:19:53 -05:00
Mike Place
edca0cdd5f
Merge pull request #41355 from Jille/fix-cp-get_str_file
...
Fix modules.cp.get_file_str to match the documentation.
2017-05-22 10:59:41 -05:00
Mike Place
6401b5af72
Merge pull request #41361 from shitler25oki/develop
...
Maintains known_hosts permissions
2017-05-22 10:42:03 -05:00
Nicole Thomas
5c4992a00c
Merge pull request #41359 from rallytime/merge-develop
...
[develop] Merge-forward from nitrogen to develop
2017-05-21 10:49:31 -06:00
Art Schneider
bd0abea50e
Maintains the permissions of known_hosts file if it exists prior to executing set_known_host
...
Updated the default permissions to 0600 for known_hosts file
2017-05-20 22:09:12 -06:00
rallytime
2ba9f644f6
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-05-20 17:08:39 -06:00
Jille Timmermans
f603e298e8
Fix modules.cp.get_file_str to match the documentation.
...
The documentation states that it will return False if the file can't be cached,
in reality it threw an IOError. This makes it return False.
2017-05-20 18:23:03 +01:00
Mike Place
e74f6241c1
Merge pull request #41264 from hrumph/regfile_read
...
Addition of import_from_regfile function to reg execution module
2017-05-19 14:04:29 -05:00
Mike Place
5bc2727d01
Merge pull request #41193 from cro/digicert_n
...
Digicert integration
2017-05-19 13:56:38 -05:00
Alexander Bauer
c66ce0f18c
Include versionadded tag for cryptdev
...
See #41321
2017-05-19 14:52:56 -04:00
Gareth J. Greenaway
89db24cb59
Adding some documentation for various rsync options including additional_opts
2017-05-19 11:51:14 -07:00
Alexander Bauer
0b51bc071a
Remove unnecessary **kwargs in set_crypttab
...
This was cargo-culted from the `mount` module, which includes it for the
sake of `salt.utils.test_mode()`, which checks all variations on
capitalization for `test` in `**kwargs` for truthiness. I have removed
the `**kwargs`, and simply check truthiness of `test` now.
See #41321
2017-05-19 14:49:15 -04:00
Mike Place
3d142213b0
Merge pull request #41304 from mcdermj/proxy-systemd-fix
...
salt-proxy: Fix systemd unit file to handle more proxy names
2017-05-19 13:28:20 -05:00
Mike Place
691a73dbf6
Merge pull request #41305 from arthtux/develop
...
correct accept_vpc_peering_connection
2017-05-19 13:26:49 -05:00
Mike Place
0d0f0d6d15
Merge pull request #41320 from shengis/azurerm_fix_show_interface
...
Fix #41315 warnings on Azure provisioning when public ip disabled
2017-05-19 13:21:13 -05:00
Mike Place
cfa0df6c87
Merge pull request #41323 from bodhi-space/infra4800
...
INFRA-4800 - fix tagging logic in boto_asg module
2017-05-19 13:13:24 -05:00
Mike Place
4c10545616
Merge pull request #41324 from bebehei/bash-completion
...
Fix bash completion
2017-05-19 13:12:50 -05:00
Mike Place
ebd8376ef4
Merge pull request #41328 from jpautler/dev/jpautler/hwclock_nilinuxrt_support
...
Update timezone get/set_hwclock for NILinuxRT systems
2017-05-19 13:04:21 -05:00
Mike Place
f39a78be1a
Merge pull request #41344 from MalloZup/fix-doc-rpm-distros
...
FIX Documentation about RPM Based distros.
2017-05-19 12:47:13 -05:00
Mike Place
940bc2bedf
Merge pull request #41331 from skizunov/develop2
...
opkg: Add `failhard` param to refresh_db
2017-05-19 12:46:13 -05:00
Mike Place
f91a866a17
Merge pull request #41334 from bodhi-space/infra4741
...
Tiny fix to boto_iam.policy_absent
2017-05-19 12:43:21 -05:00
Aurélien FUSIL-DELAHAYE
d3d54467ba
Fix #41299 list nodes in active provider only
2017-05-19 18:42:49 +02:00
Mike Place
db109a3707
Merge pull request #40911 from twangboy/win_snmp_unicode
...
win_snmp: Improve unicode support on Py2
2017-05-19 10:41:17 -05:00
dmaiocchi
4ae0e21a9b
FIX Documentation about RPM Based distros.
...
There is no YUM based distro(even the last fedora is based on dnf), so
the correct documentation is RPM.
2017-05-19 17:22:14 +02:00
Tom Williams
d52587e48a
INFRA-4741 - Tiny fix to boto_iam.policy_absent
2017-05-18 22:55:31 -04:00
Alexander Bauer
28a446d2d0
Fix linting style errors for PR #41321
2017-05-18 17:20:40 -04:00
Sergey Kizunov
af833ca212
opkg: Add failhard
param to refresh_db
...
This is done for similar reasons as PR #37910 which modifies
the `aptget.py` module to add the same parameter to `refresh_db`. Use
similar comments and coding style.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-05-18 15:25:43 -05:00
Gareth J. Greenaway
2f93f0d1cd
Adding the ability to pass additional options in the form of a list with the rsync module and state module.
2017-05-18 10:04:03 -07:00
Mike Place
cac6cce922
Merge pull request #41308 from terminalmage/py3-tests
...
Don't overwrite environment in pip tests
2017-05-18 12:01:46 -05:00
Mike Place
5406a7cdd4
Merge pull request #41314 from Lex-Persona/fix-glassfish-test
...
Fix glassfish state module
2017-05-18 11:55:35 -05:00
Mike Place
e6dabdbf6e
Merge pull request #41307 from lomeroe/fix_41306
...
properly pack/unpack the verison numbers into a number
2017-05-18 11:53:31 -05:00
Benedikt Heine
d54b893b71
convert whitespace tabs to spaces
2017-05-18 18:53:27 +02:00
Tom Williams
3467b2740a
INFRA-4800 - fix tagging logic in boto_asg module
2017-05-18 12:53:15 -04:00
Benedikt Heine
df290b7b09
expand tilde correctly in bashcompletion ( fixes #41302 )
2017-05-18 18:48:12 +02:00
Alexander Bauer
91d9ff428a
Report success correctly from cryptdev.open
...
- Reports success and failure correctly from cryptdev.open and
cryptdev.close
2017-05-18 12:16:42 -04:00
Alexander Bauer
a7accdfc15
Require cryptdevice is mapped either persistently or immediately
...
- `cryptdev.mapping` fails if neither `persist` nor `immediate` is set
See #35816
2017-05-18 12:16:42 -04:00
Alexander Bauer
b255519310
Demand keyfile when mapping a cryptdevice immediately
...
- Prevents ungraceful error or hanging when `cryptsetup` asks for a
password interactively
- `cryptdev.mapping` states which persist and map immediately succeed
partially when `keyfile` is `None`, because the crypttab can be updated,
but the immediate mapping cannot be performed
- `password` arguments in the `cryptdev` state are changed to `keyfile`,
for clarity
See #35816
2017-05-18 12:16:42 -04:00
Alexander Bauer
14ca0b7c55
Require keyfile for immediate opening
...
See #35816
2017-05-18 12:15:54 -04:00