Commit Graph

96611 Commits

Author SHA1 Message Date
Cédric Bosdonnat
a0410393ca
virt.init: allow 'none' graphics type
Graphics type 'none' will help to distinguish between no graphics data
and removal of graphics device in a future virt.update function.
2018-07-27 09:27:44 +02:00
Cédric Bosdonnat
0f5184c45c
Remove minidom use in virt module
ElementTree provides a more convenient API than minidom. Switching to
ElementTree will reduce the number of dependencies for the virt module
and simplify the code a little.
2018-07-27 09:27:44 +02:00
Cédric Bosdonnat
a3ccf8173c
Add virt.pool_info test case with no target element
The target element is not mandatory, introduce a test that we properly
handle this situation
2018-07-27 09:27:44 +02:00
Nicole Thomas
bbea9ae936
Merge pull request #48789 from rallytime/bp-48783
Back-port #48783 to 2017.7
2018-07-26 17:47:48 -04:00
kuetrzi
f440ebe91f
Update carbon_return.py
fix TypeError: not all arguments converted during string formatting
caused by extra comma accidentally being added to log statement in unicode literals update
2018-07-26 17:29:17 -04:00
William Giokas
682a05bebe
Threshold was wrong
I also removed the delta value check. It's going to be weird with the
number of runs we do, and it's also set to run on failures.
2018-07-26 17:27:02 -04:00
William Giokas
d4ca0e3a97
test: except for OSError only 2018-07-26 17:27:02 -04:00
William Giokas
4547231909
Only run lint checks against changed files 2018-07-26 17:27:02 -04:00
Nicole Thomas
41464d4b39
Merge pull request #48731 from zer0def/virt-runner-init-args
Fixed `enable_vnc` runner arg being passed into `seed_cmd` module arg in `virt.init`.
2018-07-26 17:13:58 -04:00
Nicole Thomas
3f5349dfa2
Merge pull request #48739 from mirceaulinic/net-mod-funs
Add a few functions for network configuration manipulation
2018-07-26 16:48:34 -04:00
Nicole Thomas
f428d2ad22
Merge pull request #48774 from jdito/add-gluster-arbiter
Added ability to create replica 3 arbiter 1 gluster volumes
2018-07-26 16:44:03 -04:00
Frode Gundersen
f08058b043 Merge branch '45014' of https://github.com/frogunder/salt into 45014 2018-07-26 20:09:17 +00:00
Daniel Wallace
04cd9a346a
Merge pull request #48783 from KaiSforza/pr-lint-only-diff
Only run lint checks against changed files
2018-07-26 15:07:58 -05:00
Frode Gundersen
33c20c1ec0
fix tests 2018-07-26 20:04:51 +00:00
William Giokas
84f1819f9a
Threshold was wrong
I also removed the delta value check. It's going to be weird with the
number of runs we do, and it's also set to run on failures.
2018-07-26 13:19:07 -06:00
William Giokas
335dc764e8
test: except for OSError only 2018-07-26 12:52:27 -06:00
Nicole Thomas
f05b86979a
Merge branch 'develop' into fix-40532 2018-07-26 14:20:48 -04:00
Joe DiTommasso
7fae90c2bf Fixing versionadded tags 2018-07-26 14:18:23 -04:00
Nicole Thomas
4cc778ab3d
Merge pull request #48755 from markuskramerIgitt/test_minion_id_lowercase
Add configuration test for minion_id_lowercase
2018-07-26 14:18:05 -04:00
Nicole Thomas
6978ce5d1d
Merge pull request #48747 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-07-26 14:14:33 -04:00
Damien Degois
c799ee2f7a Fix git state identity lacking of user expansion #48461 and #48462 2018-07-26 19:37:43 +02:00
Joe DiTommasso
f9f5d67424 Lint fix 2018-07-26 13:30:14 -04:00
William Giokas
efe321a31a
Only run lint checks against changed files 2018-07-26 10:38:09 -06:00
Joe DiTommasso
0d0dc35b13 Updates requested by @rallytime 2018-07-26 12:37:21 -04:00
Nicole Thomas
a7dc3ddcc8
Merge pull request #48762 from mirceaulinic/rm-template-mod
Get rid of the template module and rework a couple of modules
2018-07-26 11:42:15 -04:00
Nicole Thomas
5ea43817ab
Merge pull request #48771 from gtmanfred/2018.3
only do reverse dns lookup on ips for salt-ssh
2018-07-26 11:41:40 -04:00
Mircea Ulinic
f3630ec7e7 Add example to args.clean_kwargs to pass the new tests 2018-07-26 06:49:23 +00:00
Mircea Ulinic
2ce61a3377 Add the PeeringDB execution module to autodoc 2018-07-26 06:49:23 +00:00
Mircea Ulinic
f4e58b9946 Add the PeeringDB execution module 2018-07-26 06:49:23 +00:00
Mircea Ulinic
9af9100dee Get rid of the template mod dependency and simplify the code and usage of the pyeapi 2018-07-26 06:48:10 +00:00
Mircea Ulinic
6c70bbadde Get rid of the template mod dependency and simplify the code and usage of the nxos_api 2018-07-26 06:48:10 +00:00
Mircea Ulinic
ed704b4d49 Get rid of the template mod dependency and simplify the code and usage of the netmiko module 2018-07-26 06:48:02 +00:00
Joe DiTommasso
c36e62c653 Lint fix 2018-07-25 17:58:12 -04:00
jdito
93ade60c70
Merge branch 'develop' into add-gluster-arbiter 2018-07-25 15:40:53 -04:00
Joe DiTommasso
c92fec6f4f Added ability to create replica 3 arbiter 1 gluster volumes 2018-07-25 15:27:36 -04:00
Markus
b11ad022a7
Merge branch 'develop' into test_minion_id_lowercase 2018-07-25 18:06:21 +02:00
Nicole Thomas
fb5d63da16
Merge pull request #48761 from isbm/isbm-add-saltapi-logrotate
Add API log rotation on SUSE package
2018-07-25 11:42:45 -04:00
Nicole Thomas
816f7edc81
Merge pull request #48716 from thetoolsmith/develop
add salt cloud support for block device tagging or root devices and such
2018-07-25 11:07:56 -04:00
Nicole Thomas
f2ef2d3ef6
Merge pull request #48752 from garethgreenaway/fix_state_file_all_integers
[2018.3] Fix when state file is integers
2018-07-25 11:03:01 -04:00
Nicole Thomas
66a97f270d
Merge pull request #48746 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-07-25 11:01:15 -04:00
Nicole Thomas
705358705c
Merge pull request #48757 from kuetrzi/kuetrzi-patch-1
Update carbon_return.py
2018-07-25 10:58:34 -04:00
Nicole Thomas
030c921914
Merge pull request #48754 from lomeroe/fix-tornado-proxy
send proxy/ca_cert parameters as strings (not unicode) to tornado httpclient
2018-07-25 10:55:42 -04:00
Daniel Wallace
535fb8f8e7
only do reverse dns lookup on ips for salt-ssh
Fixes #48676
2018-07-25 09:48:29 -05:00
Nicole Thomas
097eba1b62
Merge pull request #48770 from Ch3LL/update_doc_develop
Update Saltstack Logo banner on docs.saltstack.com
2018-07-25 10:47:32 -04:00
Nicole Thomas
1eee4b136b
Merge pull request #48769 from Ch3LL/update_doc_2018.3
Update Saltstack Logo banner on docs.saltstack.com
2018-07-25 10:47:19 -04:00
Ch3LL
e760c8466a
Update Saltstack Logo banner on docs.saltstack.com 2018-07-25 10:43:37 -04:00
Ch3LL
0cb4bac798
Update Saltstack Logo banner on docs.saltstack.com 2018-07-25 10:41:43 -04:00
Nicole Thomas
169afea16a
Merge pull request #48749 from Ch3LL/logo_docs
Update Saltstack Logo banner on docs.saltstack.com
2018-07-25 09:05:04 -04:00
markuskramerIgitt
560fab5da5 Test lowercase on id_function 2018-07-25 14:05:55 +02:00
Nicole Thomas
19afa3b023
Merge pull request #48760 from dwoz/test_file_fixes
Multiple windows test fixes
2018-07-25 07:55:27 -04:00