valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,316 Commits 24 Branches 182 Tags 341 MiB
28343f0120
Commit Graph

87316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Erik Johnson
5ce14df82c
Change how members are retrieved in win_groupadd 
This is a solution that works for the other functions that interact with
group objects, making it a better overall solution to be used widely
in win_groupadd.

This also updates the mocking in the tests such that we use a more
comprehensive fake class, and more intelligent mocking of get_sam_name
using a lambda.
 2017-10-24 09:27:38 -06:00
twangboy
6ab82394be
Set up mocking 
Move the code that sets up the group object, computer object and gets
existing members out of the individual functions so they can be mocked

Mock the GroupObj
Mock the ComputerObj
Mock existing members
Still need to fix info, getent, and members
 2017-10-24 09:27:37 -06:00
Ch3LL
9e2e785034
add spm tests to test runner 2017-10-24 10:33:53 -04:00
Mike Place
405b882438 Merge pull request #44185 from sakateka/fix_requests_ssl_verify_error 
Add requests verify option in vault section
 2017-10-24 04:23:53 -06:00
Mike Place
de83ed914b Merge pull request #44207 from rallytime/followup-43821 
Add some space in new opsgenie docs for rst formmating
 2017-10-24 04:02:42 -06:00
Mike Place
a97f1c87e0 Merge pull request #44235 from xavierog/fix-grafana4-datasource-2017.7 
grafana4: datasource: handle missing keys in datasource description.
 2017-10-24 03:51:09 -06:00
Mike Place
39d60f86e8 Merge pull request #44238 from bodhi-space/infra5825 
INFRA-5825 - add delete_{ingress,egress}_rules params to boto_secgroup
 2017-10-24 03:31:16 -06:00
Mike Place
c849f350ba Merge pull request #44244 from cloudflare/add-retcode 
Add explicit non-zero retcode to napalm config functions
 2017-10-24 03:23:40 -06:00
Ch3LL
4729ccd32b
Add multiple spm integration tests 2017-10-23 17:13:32 -04:00
Nicole Thomas
320e7b3209 Merge pull request #44250 from netzmacher/develop 
small docs fix in system.py
 2017-10-23 17:01:17 -04:00
Bike Dude
9eacaeb6af
small docs fix in system.py 2017-10-23 21:35:32 +02:00
Nicole Thomas
195b225540 Merge pull request #44228 from rklaren/fix-salt-cloud-libvirt-cleanup-after-errors 
Fixes #44227, make salt-cloud/libvirt cleanup after errors more robust
 2017-10-23 13:09:34 -04:00
Nicole Thomas
e015ee7655 Merge pull request #44214 from almoore/develop 
Fix networking issue on vm creation with vmware
 2017-10-23 10:48:50 -04:00
Nicole Thomas
4278a08e40 Merge pull request #44194 from vernondcole/saltify-create-with-wake-on-lan 
add wake-on-LAN feature to saltify create
 2017-10-23 10:46:21 -04:00
Nicole Thomas
2ccfaca66c Merge pull request #44067 from eradman/check_file_meta 
Check file attributes if lsattr(1) is installed
 2017-10-23 10:30:58 -04:00
Ric Klaren
7917d1e61e
Incorporate review comments. 2017-10-23 09:28:47 -05:00
Ric Klaren
3a10b6aef1
Fixes #44227, make salt-cloud/libvirt cleanup after errors more robust 
Fix vm cleanup when salt bootstrap fails when using salt-cloud with the libvirt
provider.

Signed-off-by: Ric Klaren <ric@knightswhosay.eu>
 2017-10-23 09:28:35 -05:00
Erik Johnson
01e7bab990 Merge pull request #44008 from mtorromeo/git-noexec-fix 
Backport #43769 to 2017.7
 2017-10-23 09:19:56 -05:00
Sergey Kacheev
c755fc7235 Merge branch 'develop' into fix_requests_ssl_verify_error 2017-10-23 21:19:36 +07:00
Erik Johnson
85c0ef493f Merge pull request #44202 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-23 09:18:29 -05:00
Erik Johnson
96891a062a Merge pull request #44203 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-23 09:11:54 -05:00
Nicole Thomas
432ef25cf4 Merge pull request #44233 from sahama/develop 
change service to process in module docstring
 2017-10-23 10:01:46 -04:00
Nicole Thomas
7374403eca Merge pull request #44225 from eradman/test_btmp_wtmp 
Mock open on /var/log/btmp and /var/log/wtmp
 2017-10-23 09:51:46 -04:00
Nicole Thomas
2bc51057f2 Merge pull request #44221 from SaltyCharles/patch-18 
fix typo
 2017-10-23 09:48:37 -04:00
Nicole Thomas
6e886ee13e Merge pull request #44220 from SaltyCharles/patch-17 
fix typo
 2017-10-23 09:48:22 -04:00
Nicole Thomas
493782c97b Merge pull request #44217 from SaltyCharles/patch-14 
fix typos
 2017-10-23 09:48:04 -04:00
Mircea Ulinic
a1f27c9f00 Add explicit non-zero retcode to napalm config functions 
Thanks to @dmitrykuzmenko's explanation in #43187,
we can add explicit return code for napalm
configuration related functions: when loading
configuration fails for a reason or another
(there can be several different reasons), the
function will be considered as "failed". This will not change
any behaviour on the CLI, but it is useful in the --summary
mode to see what minions failed.
 2017-10-23 13:17:49 +00:00
Nicole Thomas
62974e4b1b Merge pull request #44199 from realjktu/keystone_sd 
Add client version discovery to Keystone module
 2017-10-23 09:11:20 -04:00
Nicole Thomas
43620df600 Merge pull request #44224 from SaltyCharles/patch-21 
fix typos
 2017-10-23 09:08:39 -04:00
realjktu
1a7b12cb89 Merge branch 'develop' into keystone_sd 2017-10-23 10:46:49 +03:00
Tom Williams
76ec24be8a Merge branch 'develop' into infra5825 2017-10-22 21:27:23 -04:00
Xavier G
c0a5880d32 grafana4: datasource: handle missing keys in datasource description. 2017-10-22 16:36:10 +02:00
me
f19e50a351 change service to process in module docstring 2017-10-22 11:02:04 +03:30
Eric Radman
10d13062ec
Mock open to /var/log/btmp and /var/log/wtmp 
- btmp may not exist
- wtmp may not exist, or it may not contain ASCII data

Unbreaks tests on OpenBSD 6.2
 2017-10-21 09:50:08 -04:00
Nicole Thomas
818100b8e7 Merge pull request #44218 from SaltyCharles/patch-15 
fix typo
 2017-10-20 17:01:34 -04:00
SaltyCharles
74622436e4 fix typos 
fix typos for clarity
 2017-10-20 14:01:05 -07:00
Nicole Thomas
3fe1a1387d Merge pull request #44223 from SaltyCharles/patch-20 
fix typo
 2017-10-20 17:00:56 -04:00
Nicole Thomas
947727f23c Merge pull request #44222 from SaltyCharles/patch-19 
fix typo
 2017-10-20 17:00:29 -04:00
Nicole Thomas
a9267439fd Merge pull request #44219 from SaltyCharles/patch-16 
fix typo
 2017-10-20 16:59:34 -04:00
SaltyCharles
1f91ee9d78 fix typo 
fix typo for clarity
 2017-10-20 13:57:58 -07:00
Nicole Thomas
4f8365dc82 Merge pull request #44216 from SaltyCharles/patch-13 
fix typo
 2017-10-20 16:57:04 -04:00