valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,908 Commits 24 Branches 182 Tags 341 MiB
17a230a2e5
Commit Graph

71908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
76e8dd974a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
 2016-07-26 11:05:24 -06:00
Mike Place
deb1331601 Merge pull request #34935 from rallytime/beacons-mod-cleanup 
Avoid UnboundLocalError in beacons module
 2016-07-26 11:01:23 -06:00
Erik Johnson
eb1ed51235 Add the ability to pack __utils__ dunder into runner funcs 2016-07-26 11:55:24 -05:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
Shane Lee
84e2e8b101 Fix grains integration tests for Windows (#34941) 2016-07-26 10:49:10 -06:00
Steve Hajducko
0095dbe530 Don't fall through to checking auth entries 
Need to skip checking for matchers when using single string matchers like @runner or @jobs
 2016-07-26 09:43:41 -07:00
Anthony Shaw
6c08afd62b GCE Cloud tests (#34871) 
* add test module

* modify GCE tests to remove mocks

* use certifi, libcloud has also patched the SuSE/Mac cert issues

* skip cert checking

* validate the __virtual__ and import process

* fix munged merge

* fixed lint errors and failing test

* fix dimensiondata tests in the same way whilst I'm here
 2016-07-26 09:24:20 -06:00
Joseph Hall
cdc9882f83 Create regdata before try/except (#34931) 2016-07-26 09:05:24 -06:00
Joseph Hall
e1a6ebac3a Add prune option to reg.list (#34934) 2016-07-26 09:03:52 -06:00
Shane Lee
c4131c0afb Skip inode test in Windows (#34938) 2016-07-26 08:59:47 -06:00
Jakub Pavlik
21fe1a0f95 Remove use_carrier bond for Ubuntu Xenial later (#34779) 
network.managed type bond generate use_carrier
option, which is unknown parameter in ubuntu 16.04

Fixes #34778
 2016-07-26 08:53:12 -06:00
Denys Havrysh
0faa490991 Fix job scheduling using `when parameter (by python-dateutil`) 2016-07-26 17:37:28 +03:00
Mike Place
29baba7574 Merge pull request #34948 from bebehei/bashcompletion-saltkey 
Bashcompletion salt-key remove headers
 2016-07-26 08:36:26 -06:00
Erik Johnson
04eb5e7e31 Add jid to salt.function orchestration events 2016-07-26 09:23:30 -05:00
Benedikt Heine
3cd47297ed [bashcompletion] replace ticks with bash subshell 2016-07-26 14:58:59 +02:00
Benedikt Heine
9091f0bffa [bashcompletion] ignore salt-key headers 2016-07-26 14:56:20 +02:00
Owen Synge
a11fca3b21 salt.modules.ceph: Fix indentation : keyring_present 
Make indentation the same as other methods.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-26 14:00:50 +02:00
Andreas Lutro
bdec73bb03 remove unnecessary os.path.basename logic 2016-07-26 13:24:31 +02:00
Owen Synge
ef53fa0fd0 salt.states.ceph: Remove HAS_CEPH_CFG 
pylint does not like unused imports so even though we will re add this later, we
remove this now to get the code upstreamed.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-26 11:37:46 +02:00
Owen Synge
a243c46769 salt.modules.ceph: Use format not substitution 
We should use new style format in salt code.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-26 10:44:07 +02:00
Owen Synge
7d3d76ee20 salt.states.ceph: Add docstring to utils 
Non exported utils also need docstring to pass pylint3

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-26 10:07:37 +02:00
Owen Synge
58fa8914c3 salt.modules.ceph: Remove tabs 
Seems some tabs got into the code base.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-26 10:06:11 +02:00
Owen Synge
54ca878d16 salt.states.ceph: Rename exception. 
pylint3 does not like single character variables.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-26 09:53:22 +02:00
Owen Synge
6b557f9515 salt.states.ceph: absolute_import 
Avoid unexpected behaviour with imports.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-26 09:37:56 +02:00
Owen Synge
c7945f08b1 salt.modules.ceph: absolute_import 
Avoid unexpected behaviour with imports.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-26 09:37:36 +02:00
Erik Johnson
60240e28d6 Add jid to orchestration returns 
This will make it easier to track the jids of jobs spawned by the
state.orchestrate runner.
 2016-07-25 21:34:19 -05:00
Thomas Jackson
d2e8b17ea4 Fix file.managed test=true hiding errors 2016-07-25 17:37:19 -07:00
twangboy
a5537ad6b9 Fix test_init, add lower 2016-07-25 16:11:36 -07:00
twangboy
e50ce384c0 Fix git integration tests for Windows 2016-07-25 15:45:11 -07:00
Nicole Thomas
5d194f2d17 Merge pull request #34933 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-25 16:09:05 -06:00
twangboy
0f74afc257 Fix test_list_minion for Windows 2016-07-25 14:49:32 -07:00
rallytime
97a36ef367 Avoid UnboundLocalError in beacons module 
Also import the correct salt.utils.event lib (not just salt.utils)
 2016-07-25 14:27:26 -06:00
rallytime
8b295fe4ea Merge branch '2015.8' into '2016.3' 
Conflicts:
salt/config/__init__.py
salt/utils/parsers.py
tests/integration/__init__.py
 2016-07-25 14:13:44 -06:00
Benedikt Heine
a7b400e923 [bash-completion] hide timeout in salt-output 
hide timeout and not corrupt the output of salt, when
show_timeout is set in master config
 2016-07-25 21:19:02 +02:00
Mike Place
ec8fc058d4 Master performance improvement (#34916) 
Reduce unneeded call to ckminions from master pub. This should be a 2x improvement or so in pub times.
 2016-07-25 09:52:46 -06:00
Vladislav Paciu
abfe9f171f fix the typo 2016-07-25 11:47:33 -04:00
Vladislav Paciu
23667a855d example added 2016-07-25 11:47:33 -04:00
Vladislav Paciu
32ed28f8ef dot between fname and extention moved in var 2016-07-25 11:47:33 -04:00
Vladislav Paciu
68abae70bb fix identation 2016-07-25 11:47:33 -04:00
Vladislav Paciu
6aa5ecab9e added extention for tmp file when using check_cmd in file.managed state 2016-07-25 11:47:33 -04:00
Alejandro Bednarik
3e32b7c408 Update service_rh provider to exclude XenServer >= 7. (#34915) 
XenServer 7 now used systemd to habdle services.
 2016-07-25 09:19:34 -06:00
Owen Synge
52c12727e0 salt.modules.ceph: shortened line 
Trying to pass pylint-3.4

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 17:10:40 +02:00
Owen Synge
f4a38a3f8d salt.modules.ceph: Fixed unused paramter 
Trying to pass pylint-3.4

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 17:09:21 +02:00
Owen Synge
a72d29a3ee salt.modules.ceph: bad-whitespace 
Trying to pass pylint-3.4

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 17:07:18 +02:00
Owen Synge
19c1f22f2e salt.modules.ceph: shortened line 
Trying to pass pylint-3.4

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 17:04:52 +02:00
Nicole Thomas
a7e7ec6d25 Merge pull request #34926 from rallytime/lint-34923 
Lint #34923
 2016-07-25 08:53:41 -06:00
rallytime
b3514abf1b Lint fixes for #34923 2016-07-25 08:52:35 -06:00
Owen Synge
114412a6f6 salt.states.ceph: Add module metadata 
Salt has a rich metadata format for all state modules.

Also improved the online help.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 15:28:45 +02:00
徐磊xulei
b1ab8b6270 pv_present should execute pvcreate with -y if existing filesystem signature detected 2016-07-25 21:27:10 +08:00
Owen Synge
2ed61d22fb salt.moduels.ceph: Add module metadata 
Salt has a rich metadata format for all modules.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 15:21:40 +02:00