Commit Graph

87377 Commits

Author SHA1 Message Date
Benedikt Werner
a546bac5f8
Fix test autosign files by using regexes 2017-10-29 14:02:40 +01:00
Benedikt Werner
3c0b324452
More quiet test.pings 2017-10-29 14:02:40 +01:00
Benedikt Werner
9866074857
Fix autosign_grains file permissions in test 2017-10-29 14:02:39 +01:00
Benedikt Werner
603bc02131
Run test.ping quiet 2017-10-29 14:02:39 +01:00
Benedikt Werner
c7ee766984
Fix test autosign_file permissions 2017-10-29 14:02:39 +01:00
Benedikt Werner
5a3fc53f59
Fix autosign grains file permission checking 2017-10-29 14:02:39 +01:00
Benedikt Werner
644da851bb
Fix autosign file permission check 2017-10-29 14:02:38 +01:00
Benedikt Werner
51ce80ce50
Fix style 2017-10-29 14:02:38 +01:00
Benedikt Werner
9786c2b328
Fix wrong rootdir foldername in test 2017-10-29 14:02:38 +01:00
Benedikt Werner
64e30ac0b2
Changed integration tests to use autosign_file to authenticate minions 2017-10-29 14:02:38 +01:00
Benedikt Werner
6db9143f08
Changed runtest daemons option help 2017-10-29 14:02:37 +01:00
Benedikt Werner
130cdcea7e
Added -y option to salt-key calls 2017-10-29 14:02:37 +01:00
Benedikt Werner
1403778c5b
Renamed 'Dameons Tests' to 'Daemon Tests' 2017-10-29 14:02:37 +01:00
Benedikt Werner
d06d031227
Moved autosign grains integration tests to its own file 2017-10-29 14:02:37 +01:00
Benedikt Werner
7ab028f99c
Fix autosign grains integration test 2017-10-29 14:02:36 +01:00
Benedikt Werner
8f2693237c
Fixed and improved autoaccept grains docs 2017-10-29 14:02:36 +01:00
Benedikt Werner
46d0979b94
Fixed autosign grains unit test 2017-10-29 14:02:36 +01:00
Benedikt Werner
89f2095af4
Changed strings to unicodes and use new fopen 2017-10-29 14:02:36 +01:00
Benedikt Werner
c3987c91ef
Fix autosign grains io error handeling 2017-10-29 14:02:35 +01:00
Benedikt Werner
244b8c2049
Fix masterapi unit test 2017-10-29 14:02:18 +01:00
Benedikt Werner
757a64a1c7
Added integration tests for autosign grains 2017-10-29 13:54:08 +01:00
Benedikt Werner
2bd1ae6501
Added unit test for check_autosign_grains 2017-10-29 13:54:05 +01:00
Benedikt Werner
d568c73c76
Prepend root dir config to autosign_grains_dir 2017-10-29 13:53:55 +01:00
Benedikt Werner
fbe4fa81d5
Added docs for autoaccepting grains 2017-10-29 13:53:49 +01:00
Benedikt Werner
2bcf0e4996
Changed name to autosign_grain 2017-10-29 13:40:47 +01:00
Benedikt Werner
ca84bd3869
Added option to autosign minions based on grains 2017-10-29 13:40:42 +01:00
Nicole Thomas
9fc7fde8d2
Merge pull request #43885 from garethgreenaway/43825_swap_total_grain
[develop] Adding swap_total to core grains
2017-10-27 13:01:11 -04:00
Erik Johnson
340a07b62f Merge pull request #44262 from oarmstrong/develop
docker_container.running sort list of links
2017-10-27 10:20:23 -05:00
Erik Johnson
50dfc74ea2 Merge pull request #44287 from jf/fix_tbz.ext_archive_type_recognition
Fix utils.files.guess_archive_type to recognize the "tbz" extension as well
2017-10-27 10:17:52 -05:00
Erik Johnson
17d8e46abf Merge pull request #44277 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-10-27 10:16:00 -05:00
Nicole Thomas
cf77a6bf0f Merge pull request #43754 from spenceation/panos-2017-9-26
Update to PANOS modules.
2017-10-27 10:36:02 -04:00
Nicole Thomas
bb65040bf1 Merge pull request #44234 from xavierog/fix-grafana4-dashboard-2017.7
grafana4: dashboard: do not override the title.
2017-10-27 10:32:16 -04:00
Xavier G
e1853e5b5b Merge branch 'develop' into fix-grafana4-dashboard-2017.7 2017-10-27 09:43:16 +02:00
Nicole Thomas
bf54e49202 Merge pull request #43861 from eyj/sentry_mod
Use dsn if specified as all recent raven libraries can init via dsn
2017-10-26 09:03:17 -04:00
Nasenbaer
35c6a02689 Add sentry config deprecation to release notes 2017-10-26 10:29:43 +02:00
nasenbaer13
aae09b1875 Merge branch 'develop' into sentry_mod 2017-10-25 21:47:04 +02:00
Mike Place
19e27436f2 Merge pull request #44278 from fedepires/softlayer-dedicated-host
Support softlayer dedicated host in salt-cloud.
2017-10-25 21:42:01 +02:00
Jeffrey 'jf' Lim
5e2cab0d5e
Fix utils.files.guess_archive_type to recognize the "tbz" extension as well
(also tidy up list of extensions)
2017-10-26 02:08:16 +08:00
rallytime
8a1c575ae5
Update salt.utils.fopen calls to new salt.utils.files.fopen path 2017-10-25 09:59:04 -04:00
Federico Pires
e7aebf46ce Support softlayer dedicated host in salt-cloud.
Update docs as well.
2017-10-25 10:58:12 -03:00
rallytime
28343f0120
Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/modules/git.py
2017-10-25 09:54:37 -04:00
Mike Place
bd75be24ca Merge pull request #44253 from Ch3LL/spm_install
Add multiple spm integration tests
2017-10-25 15:36:02 +02:00
Mike Place
75ee1ebc50 Merge pull request #44254 from twangboy/win_fix_test_win_groupadd
Fix `unit.modules.test_win_groupadd` for Windows
2017-10-25 15:33:39 +02:00
Mike Place
4c23fa63bb Merge pull request #44266 from Ch3LL/proxy_tests
Add state, grains and service proxy tests
2017-10-25 15:08:49 +02:00
Ch3LL
e5701b472d
Add state, grains and service proxy tests 2017-10-24 16:59:56 -04:00
Ollie Armstrong
2ffcc44721
docker_container.running sort list of links
When the docker_container.running module is comparing the defined state
and the current state of a container, the list of linked containers in
the current state is is a non-deterministic order. This results in a
container recreation even though the links are the same (just in a
different order).

This patches the comparison function to lexically sort both the existing
and desired list of links, making the comparison deterministic and not
recreating a container when the links have not changed.

Fixes #44258.
2017-10-24 17:37:47 +01:00
twangboy
609361bf48
Fix some lint errors 2017-10-24 09:27:39 -06:00
twangboy
1f44d8d5e6
Document helper functions 2017-10-24 09:27:38 -06:00
twangboy
b0caec320e
Move _get_all_groups up to the top 2017-10-24 09:27:38 -06:00
twangboy
7a3ff9387d
Mock the rest of the tests 2017-10-24 09:27:38 -06:00