Commit Graph

85580 Commits

Author SHA1 Message Date
Nicole Thomas
fa904ee225 Merge pull request #43229 from twangboy/win_fix_pkg.install-2017.7
Bring changes from #43228 to 2017.7
2017-08-30 10:26:55 -04:00
Marc Koderer
784a5ca036 Fix bigip documentation for delete_pool_member
Signed-off-by: Marc Koderer <marc.koderer@sap.com>
2017-08-30 16:26:26 +02:00
Nicole Thomas
3a0b02f3ae Merge pull request #43228 from twangboy/win_fix_pkg.install
Win fix pkg.install
2017-08-30 10:26:21 -04:00
Nicole Thomas
f6926bf95c Merge branch 'develop' into patch-1 2017-08-30 10:20:11 -04:00
Nicole Thomas
fbfbe31687 Lint: use salt.utils.versions instead of distutils.version for LooseVersion 2017-08-30 10:02:39 -04:00
Nicole Thomas
291c296d64 Merge pull request #43249 from dylwhich/develop
Fix scope of targets in .modules.pacman.install()
2017-08-30 09:57:39 -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
Nicole Thomas
a8e09629b2 Merge pull request #43256 from twangboy/win_skip_mac_tests
Skip mac tests for user and group
2017-08-30 09:18:11 -04:00
Robert Mader
a7c678c621 Merge branch 'develop' into patch-2 2017-08-30 10:54:58 +02:00
Robert Mader
39898636a8 Merge branch 'develop' into patch-1 2017-08-30 10:54:47 +02:00
Robert Mader
d873d39354 Merge branch 'develop' into patch-3 2017-08-30 10:54:44 +02:00
Kurach Alexander
be4fd035a4 Merge branch 'develop' into patch-1 2017-08-30 08:30:55 +03:00
Daniel Wallace
83b0bab34b opt_args needs to be a dict
For napalm grains, otherwise there is an exception during bootup
2017-08-29 18:44:21 -06: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
Justin Bradfield
25419a56db Merge branch '2017.7' into bp-43018 2017-08-29 16:50:01 -05: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
Dylan Whichard
2aebbe304a Fix scope of targets in .modules.pacman.install() 2017-08-29 16:17:03 -04:00
twangboy
e007a1c26e Fix regex, add . 2017-08-29 13:57:28 -06:00
wcannon
eccd7a6d76 adding an assertion in check list 2017-08-29 14:31:05 -05:00
twangboy
13dfabb1ce Fix regex statement, add . 2017-08-29 13:27:18 -06:00
Nicole Thomas
ac2189c870 Merge pull request #43226 from lomeroe/fix_43166
Fixes for issues in PR #43166
2017-08-29 15:05:39 -04:00
Nicole Thomas
6199fb46dc Merge pull request #43227 from twangboy/win_fix_unit_test_gitfs
Fix `unit.fileserver.test_gitfs` for Windows
2017-08-29 15:03:35 -04:00
Nicole Thomas
a4856372ca Merge pull request #43230 from mephi42/identity-service-type
salt.utils.openstack.nova: make identity service type configurable
2017-08-29 15:02:30 -04:00
twangboy
31ff69f0ad Add underscore to regex search 2017-08-29 11:43:59 -06:00
twangboy
3cf2b6575c Fix spelling 2017-08-29 11:43:59 -06:00
twangboy
ed030a35a5 Use regex to detect salt-minion install 2017-08-29 11:43:59 -06:00
twangboy
e5daff495a Fix pkg.install
I jacked this up previously
convert cmd to a list
use cmd.extend
2017-08-29 11:43:59 -06:00
Shane Lee
0c424dc4a3 Merge branch '2017.7' into fix_43166 2017-08-29 10:41:15 -06: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
Robert Mader
20a9ae10ed Add **kwargs to some file states
This silences an error message when using prereq with some file state.

See #29463 and #37090
2017-08-29 18:13:27 +02:00
Robert Mader
ae7609b8b2 Also add **kwargs to unmounted, same story 2017-08-29 18:05:40 +02:00
Nicole Thomas
e6aba8a7c2 Merge branch 'develop' into add-aptly-exec-module 2017-08-29 11:24:37 -04:00
twangboy
23ec47c74c Add _ to regex search 2017-08-29 09: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
Justin Bradfield
971b4c0890 Merge branch '2017.7' into bp-43018 2017-08-29 09:36:16 -05:00
Robert Mader
3444423c25 Add **kwargs to salt.state state
This silences an error message when using prereq with the salt.state state.

See #29463 and #37090
2017-08-29 16:34:02 +02:00
Kurach Alexander
d3a23e164f Update __init__.py
fix lint err
2017-08-29 17:00:41 +03:00
Robert Mader
7ea8524621 Add **kwargs to mount.mounted state
This silences an error message when using prereq with the mount.mounted state. See #29463
2017-08-29 15:14:07 +02:00
Benoît Knecht
3c1ddc9bde modules: iptables: correctly parse --nfmask/--ctmask
`iptables-save` can return rules like this one:

```
-A PREROUTING -m connmark ! --mark 0x0/0xffff0000 -j CONNMARK \
--restore-mark --nfmask 0xffff0000 --ctmask 0xffff0000
```

which leads to the following behavior:

```
$ salt '*' iptables.get_rules
minion:
    Minion did not return. [No response]
```

This commit fixes the behavior of `iptables.get_rules` in this case,
which also fixes the `iptables.append` state when such a rule already
exists on the minion.
2017-08-29 14:40:13 +02:00
Pedro Algarvio
630a1db3ab
Include the line number by default on the log file format 2017-08-29 12:08:41 +01:00
Timur
8f43da10bb .utils.aws.get_location() expects a dict
… as it's `provider` argument.
2017-08-29 14:05:38 +03:00
Kurach Alexander
46a91a2f5e Update __init__.py
add support for unicode symbols in vm names.
fix for '''UnicodeEncodeError: 'ascii' codec can't encode character u'\u2013' in position 5: ordinal not in range(128)'''
2017-08-29 11:07:02 +03: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
mephi42
589a1e90f2 salt.utils.openstack.nova: make identity service type configurable
At my $DAYJOB, OpenStack catalog contains identity endpoints v2 and v3.
In order to differentiate between them, admins came up with identityv3
service type. This patch allows me to write:

    provider-id:
        driver: nova
        identity_service_type: identityv3

to make use of identityv3 endpoint in this setup.
2017-08-29 00:18:13 +02:00
Mike Place
b1a3d15b28 Remove trailing whitespace for linter 2017-08-28 13:52:23 -06:00