valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,422 Commits 24 Branches 182 Tags 341 MiB
4322f009cf
Commit Graph

6359 Commits

Author SHA1 Message Date
rallytime
4322f009cf Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/auth/__init__.py
  - salt/auth/ldap.py
  - salt/grains/metadata.py
  - salt/master.py
  - salt/modules/apache.py
  - salt/modules/dockermod.py
 2017-09-01 16:37:29 -04:00
Mike Place
0e262b8c0d Merge pull request #43253 from rallytime/utils-color-moves 
Move get_colors and get_color_theme to salt.utils.color.py
 2017-09-01 12:44:40 -06:00
Mike Place
24962587bc Merge pull request #43269 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-01 12:12:36 -06:00
William Cannon
58eef3dc2c fixed dunder usage problem in unit test 2017-08-30 17:00:27 -05:00
wcannon
c080b263d5 Merge branch 'develop' into develop 2017-08-30 15:54:57 -05:00
Nicole Thomas
479e0e06ac Merge pull request #42975 from brejoc/tests-for-kubernetes-module 
Added unit tests for Kubernetes module
 2017-08-30 16:30:15 -04:00
Nicole Thomas
ca7df1d4cf Merge pull request #43176 from terminalmage/issue42935 
docker_image states: Handle Hub images prefixed with "docker.io/"
 2017-08-30 16:08:13 -04:00
Nicole Thomas
fdad9177b5 Merge branch '2017.7' into tests-for-kubernetes-module 2017-08-30 14:47:37 -04:00
rallytime
14f5e5e023 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/modules/inspectlib/collector.py
 2017-08-30 12:16:28 -04:00
Nicole Thomas
ec1bedc646 Merge pull request #43254 from twangboy/win_fix_test_inspect_collector 
Fix `unit.modules.test_inspect_collector` on Windows
 2017-08-30 11:46:07 -04:00
Nicole Thomas
25666f88f7 Merge pull request #43251 from twangboy/win_skip_test_groupadd 
Skips `unit.modules.test_groupadd` on Windows
 2017-08-30 09:56:36 -04:00
twangboy
cec627a60b Skip mac tests for user and group 
They use grp and pwd
 2017-08-29 16:28:12 -06:00
twangboy
b401340e6c Fix unit.modules.test_inspect_collector on Windows 
Uses os.sep instead of unix-style paths in the test
Uses salt.utils.path.islink() to detect symlinks instead of
os.path.islink(). os.path.islink() does not correctly detect symlinks in
Windows
Put grp and pwd imports inside a try/except block
 2017-08-29 15:59:08 -06:00
rallytime
26f52bd2b8 Move get_colors and get_color_theme to salt.utils.color.py 
Moves the `get_colors` and `get_color_theme` out of `salt.utils.py`
and into a new file named `salt.utils.color.py`.

This PR moves the original functions, adds a deprecation warning to
the old function paths, and updates any references to the functions
in Salt code to the new location. This includes moving a test as well.
 2017-08-29 17:33:01 -04:00
twangboy
5185071d5a Skips unit.modules.test_groupadd on Windows 
There is a test_win_groupadd modules for testing the win_groupadd module
on Windows.
 2017-08-29 14:29:50 -06:00
rallytime
26410c662f Update some salt.utils.x paths for moved util functions 
Through merge forwards, some of the old-style paths have made their
way into develop. This PR corrects some of these instances on the more
popular functions.
 2017-08-29 16:24:47 -04:00
twangboy
c956d24283 Fix is_windows detection when USERNAME missing 2017-08-29 10:16:21 -06:00
twangboy
869e8cc603 Fix unit.fileserver.test_gitfs for Windows 
Put `import pwd` in a try/except block
Set `os.environ['USERNAME']` in windows using win_functions
Add error function for `shutil.rmtree`
 2017-08-29 10:16:21 -06:00
Jochen Breuer
c227cb25ad
Skipping test on ImportError 
This most probably means that the Kubernetes client lib is not
installed.
 2017-08-29 17:12:25 +02:00
rallytime
6fad40454a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/utils/napalm.py
 2017-08-28 09:28:41 -04:00
rallytime
3911df2f4b Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-28 09:25:49 -04:00
Nicole Thomas
df18a89836 Lint: Remove unused import 2017-08-28 09:21:52 -04:00
Jochen Breuer
bd76a870ce
Dunder vars are now defined via setup_loader_modules 2017-08-28 14:17:00 +02:00
Mike Place
ce04ab4286 Merge pull request #42997 from twangboy/win_fix_test_module_names 
Fix `unit.test_test_module_names` for Windows
 2017-08-25 15:19:10 -06:00
Erik Johnson
7279f98e92 docker_image states: Handle Hub images prefixed with "docker.io/" 
On some platforms, for reason which I do not yet grok, images pulled
from the Hub are prefixed with "docker.io/". This causes the
docker_image states to fail unless the user manually adds "docker.io/"
before the image name.

This commit adds a new function called "docker.resolve_tag" which
disambiguates this variance and allows images to be specified without
the "docker.io/" prefix.

Resolves #42935.
 2017-08-25 00:06:28 -05:00
Nicole Thomas
a6a327b1e5 Merge pull request #43155 from terminalmage/issue43001 
Resolve image ID during container comparison
 2017-08-24 18:09:46 -04:00
garethgreenaway
0186835ebf Fix docstring in test 2017-08-24 17:08:52 -05:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
garethgreenaway
a0bb654e46 Fixing lint issues 2017-08-24 12:09:29 -07:00
Nicole Thomas
4d174746f9 Merge pull request #43049 from redmatter/add-docker-network-ipam-support 
Add docker network ipam support
 2017-08-24 12:19:16 -04:00
Alessandro -oggei- Ogier
db94f3bb1c better formatting 2017-08-24 15:07:08 +02:00
Alessandro -oggei- Ogier
e5cc667762 tests: fix a leftover and simplify some parts 2017-08-24 15:04:37 +02:00
Alessandro -oggei- Ogier
13e5997457 lint 2017-08-24 12:49:39 +02:00
Alessandro -oggei- Ogier
216ced69e5 allow comma-separated pkgs lists, quote args, test deb behaviour 2017-08-24 12:00:36 +02:00
Andy Bulford
89ac3f9092 Merge branch 'develop' into add-docker-network-ipam-support 2017-08-23 23:02:07 +01:00
rallytime
c48801095f Remove tests for old git_pillar syntax. 
These tests were testing things present in the legacy git pillar syntax
and are no longer needed. The new git pillar syntax has many more integration
tests to cover various cases.
 2017-08-23 16:49:58 -04:00
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
twangboy
2722e9521d Use os.path.join to create paths 2017-08-23 14:43:44 -06:00
Mike Place
0f4d1dd767 Merge pull request #41662 from lordcirth/nfs-exports 
Expand module nfs3
 2017-08-23 12:19:34 -06:00
Mike Place
970003731a Merge pull request #42111 from bechtoldt/fix_ssh_auth_keys_newline 
stripping whitespaces/newlines in authorized key file lines
 2017-08-23 12:12:25 -06:00
Mike Place
ae5d3ffe99 Merge pull request #43013 from amendlik/kernelpkg-remove 
Add kernelpkg functions to remove kernel packages
 2017-08-23 11:47:58 -06:00
Erik Johnson
d5b2a0be68 Resolve image ID during container comparison 
This fixes an issue where inspecting the container returns an image ID
instead of an image name, resulting in a spurious report of a changed
image. By resolving the image down to its ID for both the existing and
new containers, we ensure we're comparing ID to ID.
 2017-08-23 12:23:33 -05:00
Mike Place
03f652159f Merge pull request #43123 from twangboy/win_fix_test_which 
Fix `unit.utils.test_which` for Windows
 2017-08-23 10:01:38 -06:00
rallytime
0eafc59f33 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/win_groupadd.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/url.py
 2017-08-23 10:07:01 -04:00
Nicole Thomas
0467a0e3bf Merge pull request #43038 from twangboy/win_unit_utils_test_url 
Fix `unit.utils.test_url` for Windows
 2017-08-23 09:35:24 -04:00
twangboy
ed97cff5f6 Fix unit.utils.test_which for Windows 
This test wasn't really written with Windows in mind. Uses PATHEXT that
actually resembles a Windows environment. The test value has the correct
path seperator for Windows.
 2017-08-22 16:59:22 -06:00
Mike Place
87c918583d Merge branch 'develop' into nfs-exports 2017-08-22 15:09:49 -06:00
Mike Place
7c68c93e93 Merge pull request #42720 from kunal-bajpai/modularise-tokens 
Modularise eauth token storage and authentication
 2017-08-22 14:10:45 -06:00
Mike Place
874dd2245a Merge pull request #41868 from yagnik/nacl_renderer 
Add support for nacl renderer for encrypted data
 2017-08-22 13:36:38 -06:00
Adam Mendlik
017eb849f1 Remove kernelpkg test assertions added in Python 3.6 2017-08-22 13:05:32 -06:00