Commit Graph

10921 Commits

Author SHA1 Message Date
Aneesh Agrawal
2e9f1999f6 Upstream boto_cloudfront execution and state modules
AWS recently added support for tagging CloudFront distributions,
which allows us to start managing them via Salt
as we can insert a Salt-controlled identifier as a `Name` tag.
(CloudFront distributions get unique IDs generated by AWS,
which we can't predict and thus use to manage them idempotently.)
2017-09-11 23:36:31 +00:00
Mike Place
08d102c869 Merge pull request #41943 from twangboy/win_unit_test_local_cache
Fix `unit.returners.test_local_cache` for Windows
2017-09-11 15:34:02 -06:00
Mike Place
50ab79f0cb Merge pull request #43424 from twangboy/win_unit_test_hosts
Fix `unit.modules.test_hosts` for Windows
2017-09-11 15:28:41 -06:00
Mike Place
2ac185b055 Merge pull request #43439 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-09-11 15:18:40 -06:00
Mike Place
2c28156b89 Merge pull request #41619 from skizunov/develop2
Add ability to set minion ID by module
2017-09-11 15:16:50 -06:00
Mike Place
bb8bffde1a Merge pull request #42915 from garethgreenaway/missing_minions_branch
Show missing minions in lists & nodegroups
2017-09-11 13:38:55 -06:00
Mike Place
da16b6670a Merge pull request #42752 from skizunov/develop4
Add config option to ensure jid is unique
2017-09-11 13:38:30 -06:00
Mike Place
9b60cc0d1f Merge pull request #43137 from aogier/x-no-grains-on-jenkins
system group creation integration test
2017-09-11 13:09:36 -06:00
Mike Place
0e42e8f9cc Merge pull request #43188 from alexbleotu/ext_pillar_config_param-gh
Ext pillar config param gh
2017-09-11 12:58:01 -06:00
Mike Place
e7a411c7f4 Merge pull request #43252 from rallytime/utils-files-moves
Move salt.utils.istextfile to salt.utils.files.is_text_file
2017-09-11 12:42:40 -06:00
rallytime
5413a5337e Lint: remove unused import 2017-09-11 14:34:20 -04:00
Mike Place
ca091bc8a4 Merge pull request #43438 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-09-11 12:33:38 -06:00
twangboy
c0dc3f73ef Use sys.platform instead of salt.utils to detect Windows 2017-09-11 12:22:06 -06:00
twangboy
e496d28cbf Fix unit.utils.test_verify for Windows
Use Windows api to get and set the maxstdio
Change messages to work with Windows
2017-09-11 12:22:06 -06:00
Mike Place
a9592dd3e2 Merge pull request #43320 from twangboy/win_fix_alternatives
Fix `unit.modules.test_alternatives` for Windows
2017-09-11 11:27:59 -06:00
Mike Place
9b89e49846 Merge pull request #43363 from twangboy/scratch_ini_tests
Fix `unit.modules.test_ini_manage` for Windows
2017-09-11 11:10:30 -06:00
rallytime
984fa35062 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/key.py
  - salt/modules/mount.py
  - salt/modules/system.py
  - tests/unit/modules/test_mount.py
  - tests/unit/modules/test_pam.py
  - tests/unit/modules/test_parted.py
2017-09-11 12:55:39 -04:00
Mike Place
2964707e5d Merge pull request #43341 from ixs/fedora-rh_ip
Fix rh_ip template use for Fedora
2017-09-11 10:30:53 -06:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7'
No conflicts.
2017-09-11 12:24:10 -04:00
Mike Place
9f421dde89 Merge pull request #43370 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-09-11 09:38:20 -06:00
Mike Place
e89e23a32e Merge pull request #43422 from twangboy/win_unit_cloud_ec2
Fix `unit.cloud.clouds.test_ec2` for Windows
2017-09-11 09:17:19 -06:00
rallytime
e11aa7e5ef Adjust test mocking to handle __utils__['files.is_text_file'] 2017-09-11 10:25:00 -04:00
rallytime
1279556873 Move salt.utils.istextfile to salt.utils.files.is_text_file
Moves the original function to `salt.utils.files.py`, adds a deprecation
warning to the original function, and updates all of the istextfile
references in salt code.
2017-09-11 10:21:43 -04:00
Alexandru Bleotu
0882fed61a Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-10 18:46:57 +01:00
twangboy
90dcf8287c Fix unit.modules.test_hosts for Windows
Fix problem with TmpStringIO Class on Windows. The module uses this
class twice in normal operation. In Windows there's an additional run
before the real runs where it is opened with mode='w'. This causes the
data to be wiped out. So, this sets it to only save the value in the
instance to data if it is not empty.

Use the windows path to the hosts file in Windows
2017-09-08 17:21:01 -06:00
twangboy
b2cea18d13 Fix unit.modules.test_gem for Windows
Mock `salt.utils.is_windows` to return False so the test will run on
Windows
2017-09-08 15:53:07 -06:00
twangboy
1379627334 Fix unit.cloud.clouds.test_ec2 for Windows
Mock instead of create tempfile
2017-09-08 15:36:52 -06:00
Alessandro -oggei- Ogier
496f14a7e7 forgot to mock the proper one 2017-09-08 21:37:09 +02:00
Nicole Thomas
97f05ff603 Merge pull request #43398 from twangboy/win_fix_test_mount
Fix `unit.modules.test_mount` for Windows
2017-09-08 09:39:28 -04:00
Nicole Thomas
6a4cc5c1b0 Merge pull request #43399 from twangboy/win_fix_test_pam
Fix `unit.modules.test_pam` for Windows
2017-09-08 09:37:49 -04:00
Nicole Thomas
2b5cfae3f8 Merge pull request #43400 from twangboy/win_unit_test_parted
Fix `unit.modules.test_parted` for Windows
2017-09-08 09:36:59 -04:00
Nicole Thomas
332deeb013 Merge pull request #43401 from twangboy/win_unit_test_pw_group
Fix `unit.modules.test_pw_group` for Windows
2017-09-08 09:35:44 -04:00
Nicole Thomas
c0f54bfef1 Merge pull request #43402 from twangboy/win_unit_test_qemu_nbd
Fix `unit.modules.test_qemu_nbd` for Windows
2017-09-08 09:34:57 -04:00
Alessandro -oggei- Ogier
8d79ee2d49 test system group creation 2017-09-08 10:34:14 +02:00
Alessandro -oggei- Ogier
70642e495d better qemu_static parameter mangle in deboostrap management, tests 2017-09-08 10:17:32 +02:00
twangboy
6ceb895a84 Use os.path.join for paths 2017-09-07 16:51:10 -06:00
twangboy
531ce8022b Fix unit.modules.test_qemu_nbd for Windows
Use os.sep
2017-09-07 15:44:35 -06:00
twangboy
78e39a1b9d Fix unit.modules.test_pw_group for Windows
Skip `test_info` and `test_getent` because they require grp which is not
available on Windows
2017-09-07 15:34:57 -06:00
twangboy
8e3e897ee2 Fix unit.modules.test_parted for Windows
Mock salt.utils.is_windows to be False so that the __virtual__ tests
will run
2017-09-07 15:27:11 -06:00
twangboy
6257aa964a Fix unit.modules.test_pam for Windows
Mocks os.path.exists
2017-09-07 15:18:14 -06:00
twangboy
4a8d7e522c Fix tests, Use full path to salt.utils.which 2017-09-07 14:41:56 -06:00
Sergey Kizunov
88ee8ad566 Add config option id_function
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-09-07 13:41:10 -05:00
Sergey Kizunov
3c58717c58 Add config option to ensure jid is unique
Having a jid that is occasionally not unique (eg two processes creating
jobs at about the same time) causes problems in my usage due to
job tracking assuming unique jids. Add a config option called `unique_jid`
that will enforce unique jids, but will change the jid format by
appending an underscore and the process id.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-09-07 13:25:35 -05:00
Nicole Thomas
6106aec696 Merge pull request #43356 from gtmanfred/2016.11
never-download got readded
2017-09-07 13:46:04 -04:00
Nicole Thomas
3f19b247f3 Add handler.messages back in for test comparison 2017-09-07 11:51:39 -04:00
Jochen Breuer
20619b24c4
Fixed test for delete_deployment
Due to implementation change, we need to mock the return value.
2017-09-07 10:20:46 +02:00
twangboy
a909813fa5 Remove unused import (lint) 2017-09-06 15:56:24 -06:00
twangboy
3ef8d714cb Fix unit tests to mock salt.utils.path.readlink 2017-09-06 13:03:14 -06:00
twangboy
7c4460164b Fix alternatives for Windows
Not sure this is necessary... I don't think alternatives is a thing in
Windows. Anyway, it uses `__salt__['file.readlink']` instead of
`os.readlink` as there is no `os.readlink` in Windows.
Modifies the tests to mock `__salt__['file.readlink']` instead of
`os.readlink`
2017-09-06 13:03:14 -06:00
Aneesh Agrawal
60d80e7cda Add utils function to merge state returns
This makes it possible to merge the state return
for a subresource into a main state return.
This is useful for configuring e.g. alarms to go along with a resource.
2017-09-06 18:14:04 +00:00
Alexandru Bleotu
103ef69016 Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-06 18:49:37 +01:00
Alexandru Bleotu
33feda7a5b Mocked salt.utils.args.get_function_argspec instead of inspect.getargspec in all external pillar data tests 2017-09-06 12:26:40 -04:00
Nicole Thomas
7d462d29c2 Merge branch 'develop' into expand-list_pkg-attr-parameter 2017-09-06 12:15:01 -04:00
Nicole Thomas
5111cf8bad Merge branch '2016.11' into 43086-no-member 2017-09-06 10:41:18 -04:00
rallytime
5701d54516 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/state.py
  - salt/utils/gitfs.py
2017-09-06 09:39:27 -04:00
Andreas Thienemann
6aefa5c3f8 Update unit test to provide osmajorrelease grain. 2017-09-06 03:46:00 +02:00
twangboy
a94319a082 Make sure formatting of TEST_FILE_CONTENT matches original 2017-09-05 17:03:50 -06:00
twangboy
6263bc8983 Remove print statement 2017-09-05 16:48:58 -06:00
twangboy
79cd3831ae Fix empty value preserved test 2017-09-05 16:44:12 -06:00
twangboy
85997391f1 Is this handled the same on Linux and Windows 2017-09-05 16:32:43 -06:00
Nicole Thomas
f19274e1b4 Merge pull request #43222 from rallytime/oxygen-warnings-env
Remove deprecation warnings for "env"
2017-09-05 18:24:54 -04:00
Mike Place
a414325a82 Merge pull request #43070 from lyft/support-states-returning-a-list-of-comments
Support states returning a list for ret['comment']
2017-09-05 16:19:26 -06:00
Mike Place
f902bd8bc9 Merge pull request #43152 from garethgreenaway/adding_custom_beacons
Adding custom beacons with beacon module
2017-09-05 15:37:39 -06:00
rallytime
b93392dfb7 Return a SaltInvocationError when passing incorrect function pattern
When calling an incorrectly formatted wheel or runner function, we should
be raising a SaltInvocationError with a hint to check function syntax rather
that raising an Eauth authentication error.

This PR does several things:

- Adds a dictionary error return when the function syntax passed through to
`utils.minions.CkMinions.spec_check` does not match the expected `module.function`
syntax
- Handles the return of this new dictionary error (instead of previous `False` return)
wherever the spec_check function is called. This is handled up the stack in
`master.py` and `masterapi.py`.
- Reworks the runner and wheel functions in `master.py` and `masterapi.py` to
help make those functions more DRY (see `salt.auth.check_authentication` function).
- Adds tests for all of these changes (written before the runner and wheel functions
were moved to use the new salt.auth.check_authentication function)  to help prevent
regressions.
- Fixes a couple of places where unit tests exposed potential stacktraces.
- Adjusts one previous unit test concerning the dictionary error change from spec_check
2017-09-05 17:08:50 -04:00
Mike Place
6e1b541b46 Merge pull request #43232 from terminalmage/gitfs-inheritance
Improve inheritance in salt.utils.gitfs
2017-09-05 14:37:05 -06:00
Mike Place
9c57869234 Merge pull request #43276 from rallytime/utils-state-moves
Move state-related utils to salt.utils.state.py
2017-09-05 14:20:08 -06:00
Aneesh Agrawal
ba63920874 Support states returning a list for ret['comment']
Some states are complicated and multiple subparts,
or maybe cross-call into __states__ if they manage subresources.
In these cases, they will have multiple comments.
Make this more ergonomic by supporting a list of strings as the
value for ret['comment'] in state returns and documenting this.
By joining comments on newlines, it is possible to combine
single-line and multi-line comments cleanly, as opposed to e.g. commas.

The driving impetus for this is some of the boto modules.
An update to the boto_sqs module is included as an example.

Add a check that outgoing state return data has the right shape,
and add a testcase as well.
Fix the NPM state tests and the saltmod runner & wheel state functions
to comply with the prescribed format.
2017-09-05 19:52:42 +00:00
Daniel Wallace
9911b04208 fix test 2017-09-05 13:52:02 -06:00
rallytime
ed9b45ceaa Adjust a couple more tests to handle __utils__['state.check_result'] mocking 2017-09-05 10:11:11 -04:00
Robin Lutz
ba7d00f58e use dep_getkey for atom extraction to allow non existing versions and packages, added unit test to verify behaviour 2017-09-05 09:34:54 +02:00
Silvio Moioli
130c1b1c21 Merge branch 'develop' into expand-list_pkg-attr-parameter 2017-09-04 15:36:44 +02:00
twangboy
5bd5ea042a Fix unit.modules.test_chef for Windows
Mocks the __opts__ to contain cachedir
2017-09-01 14:49:50 -06:00
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
rallytime
d891433214 Adjust test mocking to handle __utils__['state.check_result'] 2017-09-01 16:09:59 -04:00
rallytime
8127bca9ed Use __utils__ where possible for moved state utils
And update all references to new state names in salt.utils.state.py
2017-09-01 16:09:59 -04:00
rallytime
4a86f23bf1 Move state-related utils to salt.utils.state.py
Moves the following functions from `salt.utils` to `salt.utils.state`:
- gen_state_tag
- search_onfail_requisites
- check_onfail_requisites
- check_state_result

Original functions have a deprecation warning added and all references
in Salt code were updated to use the new function path, including moving
some unit tests.
2017-09-01 16:09:59 -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
Silvio Moioli
3dc46212cc test_yumpkg: adapt to new supported attrs 2017-08-31 16:21:26 +02:00
Silvio Moioli
7b0a7432f4 test_zypper: adapt to new supported attrs 2017-08-31 16:21:26 +02:00
William Cannon
58eef3dc2c fixed dunder usage problem in unit test 2017-08-30 17:00:27 -05:00
Nicole Thomas
bab9a49418 Merge branch 'develop' into ext_pillar_config_param-gh 2017-08-30 17:44:41 -04: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
Nicole Thomas
3777b34572 Merge branch '2017.7' into win_unit_test_local_cache 2017-08-30 12:16:52 -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
rallytime
29a763ffcb Lint: Remove extra space 2017-08-30 09:38:39 -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
Erik Johnson
53bd3a3e23 Improve inheritance in salt.utils.gitfs
This makes the following changes:

1. Renames the valid_providers param in GitBase to git_providers,
   allowing for a dictionary mapping provider names to their associated
   classes. This allows for alternate providers to be used with a
   GitBase subclass.
2. Renames the get_provider function to verify_provider to reduce
   confusion with git_providers.
3. Uses super() to run a parent class' dunder init instead of invoking
   the parent class directly.
2017-08-28 21:49:42 -05:00
rallytime
375b1faa92 Remove deprecation warnings for "env"
Removal of these deprecation warnings has no behavioral effect, as
support for "env" instead of "saltenv" in these cases has already
been removed. Only the warning text will no longer display to users.
2017-08-28 10:37:05 -04: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
Nicole Thomas
a563a9422a Merge pull request #43201 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-25 18:56:46 -04:00
Mike Place
cfde26562b Merge pull request #42991 from DarkKnightCZ/exec-code-all-fix
Allow cmdmod.exec_code_all to utilize cmdmod.run_all parameters
2017-08-25 15:25:31 -06: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
Mike Place
f16b7246e4 Merge pull request #43103 from aogier/43101-genesis-bootstrap
genesis.bootstrap deboostrap fix
2017-08-25 14:48:23 -06:00
rallytime
d40eba6b37 Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/states/git.py
2017-08-25 16:07:27 -04:00
Mike Place
5471f9fe0c Merge pull request #43196 from gtmanfred/2016.11
Pin request install to version for npm tests
2017-08-25 12:43:05 -06:00
Daniel Wallace
ccd2241777 Pin request install to version
This fails on centos 6 because its node is too old to support the version of
hawk bumped here https://github.com/request/request/pull/2751, we can still
test the functionality.  This will pull from github, and install a specific tag
version, and we still do the uninstall using the github path.

This should be more stable.
2017-08-25 10:23:35 -06:00
Alexandru Bleotu
dc082a2087 pylint fix and fix when calling _external_pillar_data function 2017-08-25 06:41:30 -04:00
Alexandru Bleotu
a771dd94f3 Added tests for external pillar function calls 2017-08-25 06:41:27 -04:00
Alexandru Bleotu
2090d9d32f Added tests for AsyncRemotePillar adding extra minion data from config 2017-08-25 06:41:25 -04:00
Alexandru Bleotu
5b383f0036 Added tests for RemotePillar adding extra minion data from config 2017-08-25 06:41:23 -04: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
garethgreenaway
d3cb78e74e Merge branch 'develop' into adding_custom_beacons 2017-08-24 17:25:13 -07: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
Gareth J. Greenaway
41790d4f28 Missing the test_add Beacon test. 2017-08-24 10:24:27 -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
Nicole Thomas
5f0bdd620e Merge branch 'develop' into exec-code-all-fix 2017-08-24 12:18:36 -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
garethgreenaway
92bc4fa39b Merge branch 'develop' into missing_minions_branch 2017-08-23 12:56:02 -07: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
Nicole Thomas
177a4c366a Merge pull request #42729 from DSRCorporation/features/19732_extended_ext_auth
Allow `external_auth` limit funs/args for runner/wheel modules.
2017-08-22 14:19:06 -04:00
Mike Place
7d52bcee46 Merge pull request #42894 from gilbsgilbs/postgres-valid-until
Add support for PostgreSQL password expiration.
2017-08-22 12:14:53 -06:00
Mike Place
1e1a81036c Merge pull request #42962 from twangboy/win_unit_test_doc
Fix `unit.test_doc test` for Windows
2017-08-22 12:06:22 -06:00
Daniel Wallace
ea9e6dfd73 Merge branch 'develop' into modularise-tokens 2017-08-22 08:49:55 -06:00