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
85,440 Commits 24 Branches 182 Tags 341 MiB
60d80e7cda
Commit Graph

85440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Mike Place
c6664291ce Merge pull request #43206 from rallytime/tkwilliams-boto-mentionbot 
Always notify tkwilliams when changes occur on boto files
 2017-08-28 13:26:17 -06:00
twangboy
b1788b1e5f Bring changes from #43228 to 2017.7 2017-08-28 12:35:46 -06:00
Mike Place
b4c689dff5 Merge pull request #43191 from viktorkrivak/fix-apache-config-multi-entity 
Fix apache.config with multiple statement
 2017-08-28 12:13:43 -06:00
Mike Place
d685cfe4b3 Merge pull request #43214 from brejoc/fix_for_install_time_rh 
Checking install_time for None value
 2017-08-28 11:14:37 -06:00
Mike Place
d6d68d97ad Merge pull request #43218 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-28 11:10:53 -06:00
Mike Place
7ee18ee9f9 Merge pull request #43219 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 25
 2017-08-28 11:08:42 -06:00
Nicole Thomas
b90e59ede9 Merge pull request #43154 from lomeroe/bp-43116-2016.11 
Backport #43116 to 2016.11
 2017-08-28 12:40:40 -04:00
Nicole Thomas
6adc03e4b4 Merge pull request #43217 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-28 12:36:28 -04:00
m03
4516e13112 Leverage stringutils 2017-08-28 08:55:12 -07:00
lomeroe
b6c25978ff correcting bad format statement in search for policy to be disabled (fix 
for #43166)
verify that file exists before attempting to remove (fix for commits
from #39773)
 2017-08-28 10:13:10 -05:00
Viktor Krivak
c15bcbe1cc Merge remote-tracking branch 'upstream/2016.11' into fix-apache-config-multi-entity 2017-08-28 17:01:35 +02:00
lomeroe
324cfd8d1e correcting bad format statement in search for policy to be disabled (fix 
for #43166)
verify that file exists before attempting to remove (fix for commits
from #39773)
 2017-08-28 09:39:51 -05:00
lomeroe
8f593b0b02 verify that files exist before trying to remove them, win_file.remove 
raises an exception if the file does not exist
 2017-08-28 09:24:25 -05:00
rallytime
a8b786d0f2 Reduce the number of days an issue is stale by 25 2017-08-28 09:38:37 -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
448086d2cb Merge pull request #43074 from twellspring/boto_elbv2_updates 
Boto elbv2 updates
 2017-08-28 09:24:45 -04:00
Nicole Thomas
df18a89836 Lint: Remove unused import 2017-08-28 09:21:52 -04:00
Nicole Thomas
5308c27f9f Merge pull request #43202 from garethgreenaway/42642_2016_11_augeas_module_revert_fix 
Reverting previous augeas module changes
 2017-08-28 09:14:27 -04:00
Nicole Thomas
9dbdb7c7d8 Merge pull request #43209 from eliezerlp/develop 
Remove references to SaltConf16 and generalize related README
 2017-08-28 09:09:10 -04:00
Jochen Breuer
bd76a870ce
Dunder vars are now defined via setup_loader_modules 2017-08-28 14:17:00 +02:00
Jochen Breuer
7071e3425c
Checking install_time for None value 
RedHat systems might in some cases return None as install_time,
which would cause a ValueError.

We are checking for None now. install_date and install_date_time
are being set to None in that case.
 2017-08-28 13:55:22 +02:00
m03
2ae911fa5e Improved list_repos functionality 2017-08-28 01:04:39 -07:00
m03
3c6f4d4a1a Add aptly execution module 2017-08-28 00:13:13 -07:00
Mapel88
25c8190e48 Fix pylint errors 
Fix pylint errors
 2017-08-28 10:12:56 +03:00
Mapel88
1eba8c4b8e Fix pylint errors 
Fix pylint errors
 2017-08-28 10:11:36 +03:00
Todd Wells
24445599a2 Merge branch 'develop' into boto_elbv2_updates 2017-08-27 14:36:10 -07:00
Eliezer Paiewonsky
f20dda890a Remove references to SaltConf16 and generalize related README 2017-08-27 17:33:40 -04:00
rallytime
453c3d7f20 Always notify tkwilliams when changes occur on boto files 2017-08-25 19:34:29 -04: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
c0279e491e Merge pull request #43006 from SuperPommeDeTerre/SuperPommeDeTerre-patch-#26995 
Try to fix #26995
 2017-08-25 15:16:06 -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