Commit Graph

71471 Commits

Author SHA1 Message Date
Mike Place
46901c6e65 Disable test
There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
2016-07-18 12:39:49 -06:00
Mike Place
0064f8ab6a Merge pull request #31991 from cachedout/issue_31739
Report unresponsive minions in batch mode
2016-07-18 12:35:43 -06:00
Mike Place
7dbb912739 Merge pull request #34742 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-07-18 12:28:31 -06:00
Mike Place
c0e2657c8e Merge pull request #34744 from jtand/test_valid_docs_fix
Test valid docs fix
2016-07-18 12:22:47 -06:00
Mike Place
76e19501c6 Merge pull request #34700 from bodhi-space/elasticache-bits
Add several useful functions to boto_elasticache state and execution modules.  Clean up hard-to-parse multi-line log messages in boto_iam and boto_s3_bucket states
2016-07-18 12:01:28 -06:00
Mike Place
81f29006f2 Merge pull request #34741 from rallytime/bp-34726
Back-port #34726 to 2015.8
2016-07-18 12:00:22 -06:00
Joseph Hall
23032f6d30 Use shorter code for clear, as per cachedout 2016-07-18 11:56:21 -06:00
Joseph Hall
78ce7ff4e0 Update docstrings 2016-07-18 11:52:32 -06:00
Joseph Hall
13516fd33d Add clear() and delete() to the thorium register 2016-07-18 11:48:23 -06:00
Mike Place
b2d636017d Add IPC to minion opts 2016-07-18 11:46:52 -06:00
Mike Place
55df25dcea Restore eauth attr 2016-07-18 11:42:21 -06:00
rallytime
ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure
Refs #27980
2016-07-18 11:26:36 -06:00
Justin Anderson
4fe33a7695 add directives example to ldap3.modify 2016-07-18 11:17:24 -06:00
rallytime
0baf92a972 Remove tests that were deleted in develop already 2016-07-18 11:14:21 -06:00
Mike Place
ab07b23edc Lint 2016-07-18 10:48:27 -06:00
Mike Place
74e1803111 Report unresponsive minions in batch mode
Closes #31739
2016-07-18 10:48:26 -06:00
Justin Anderson
6fa40a0d46 Add cli examples for ldap3 module 2016-07-18 10:47:12 -06:00
Tom Williams
0a74a326ea Dangit! I can't see a way to blame the crappy wireless on the plane for this one, so I'll just say "oops"... 2016-07-18 12:39:05 -04:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
2016-07-18 10:34:03 -06:00
Justin Anderson
b94e0dd95a ipset.long_range doesn't need a docstring 2016-07-18 10:32:32 -06:00
Nicole Thomas
d4adf98b85 Merge pull request #34740 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-07-18 10:28:56 -06:00
Dmitry Kuzmenko
5923d12cb1 Minor. Fixed CR finding. 2016-07-18 19:15:28 +03:00
Dmitry Kuzmenko
27017e34ce Regex support in publisher ACL rules.
Users in publisher ACL and users and functions in the publisher ACL
blacklist now have matched in the following order:
1. Equality
2. Glob
3. Regex

Users in publisher ACL still not supported in systems without pwd python
module (Windows, any else?)
2016-07-18 19:15:28 +03:00
Martin Hoefling
d949110993 Loop over updated keys in non recursive update
Remove dict.update and always use loop because this is failing for
 NamespacedDictWrapper.
2016-07-18 09:55:59 -06:00
rallytime
7d106c78f0 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-18 09:45:00 -06:00
Mike Place
efc7599f85 Merge pull request #34607 from isbm/isbm-config-reading-exit-2016.3
Bugfix: Exit on configuration read (backport)
2016-07-18 09:15:21 -06:00
Mike Place
d0e0c0186b Merge pull request #34739 from cachedout/remove_config_test
Remove unnedeed config test
2016-07-18 09:15:15 -06:00
Bo Maryniuk
3cb6940904 Bugfix: access 'osmajorrelease' as an integer value 2016-07-18 17:14:57 +02:00
Mike Place
4625ee65b8 Remove unnedeed config test
Refs #34607
2016-07-18 09:12:18 -06:00
Mike Place
c6700a219a Document how to test for the existence of a log message (#34738) 2016-07-18 09:12:13 -06:00
Mike Place
993b217ce1 Merge pull request #34582 from Azidburn/fix-pkg-fromrepo
fix for mod_aggregate in pkg.py (state module), if fromrepo is used
2016-07-18 07:05:23 -06:00
Mike Place
e88ee64e06 Merge pull request #34611 from bodhi-space/develop
INFRA-1590 - add several useful functions/fixes to boto_asg, boto_iam, boto_lc
2016-07-18 07:03:33 -06:00
Mike Place
a480dfbaf4 Merge pull request #34730 from msciciel/module-mine-valid-function
Add valid function to mine module.
2016-07-18 06:41:23 -06:00
Taras Yermolenko
f8a1b59850 Added network_interface_id and network_interface_name to
instance_present state in boto_ec2
2016-07-18 16:42:41 +10:00
Taras Yermolenko
1de2e6c43e Fixes name to id resolution for Elastic Network Interface. 2016-07-18 16:33:25 +10:00
Mike Place
c10ec63def Merge pull request #34726 from martinhoefling/patch-2
Always loop over updated keys in non recursive update
2016-07-17 21:02:29 -06:00
Mike Place
076818f0a5 Merge pull request #34731 from rallytime/iteritems-cloud-grains-utils
Change iteritems() to six.iteritems in cloud, grains, and utils directories
2016-07-17 21:01:03 -06:00
rallytime
dbb5724f40 Use six.iteritems instead of iteritems() in configcomparer 2016-07-17 14:11:50 -06:00
rallytime
334c9dd938 Use six.iteritems instead of iteritems() in etcd_util 2016-07-17 14:10:52 -06:00
rallytime
4b5cc8e2c7 Use six.iteritems instead of iteritems() in psutil_compat 2016-07-17 14:09:28 -06:00
rallytime
d0bf488105 Use six.iteritems instead of iteritems() in junos grains 2016-07-17 14:06:37 -06:00
rallytime
de44c244ba Use six.iteritems instead of iteritems() in vultrpy driver 2016-07-17 14:04:47 -06:00
rallytime
754d79db0b Use six.iteritems instead of iteritems() in profitbricks driver 2016-07-17 14:03:09 -06:00
rallytime
96055b4fc6 Use six.iteritems instead of iteritems() in nova driver 2016-07-17 14:01:54 -06:00
rallytime
87a5839773 Use six.iteritems instead of iteritems() in linode driver 2016-07-17 14:00:45 -06:00
rallytime
4e7cb49f65 Use six.iteritems instead of iteritems() in ec2 driver 2016-07-17 13:59:50 -06:00
Elias Probst
76cf064dc0 modules/ebuild: Add handling for InvalidAtom exception (#34727)
Otherwise, an invalid pkg atom such as generated by the following state:

```SaltStack
sys-apps/systemd:
  pkg.installed:
    - pkgs:
      - sys-apps/systemd: '[curl, importd, nat]'
```

…would lead to this backtrace:

```
          ID: sys-apps/systemd
    Function: pkg.installed
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib64/python2.7/site-packages/salt/state.py", line 1723, in call
                  **cdata['kwargs'])
                File "/usr/lib64/python2.7/site-packages/salt/loader.py", line 1650, in wrapper
                  return f(*args, **kwargs)
                File "/usr/lib64/python2.7/site-packages/salt/states/pkg.py", line 1062, in installed
                  **kwargs)
                File "/usr/lib64/python2.7/site-packages/salt/states/pkg.py", line 454, in _find_install_targets
                  if not __salt__['pkg_resource.check_extra_requirements'](key, val):
                File "/usr/lib64/python2.7/site-packages/salt/modules/pkg_resource.py", line 290, in check_extra_requirements
                  return __salt__['pkg.check_extra_requirements'](pkgname, pkgver)
                File "/usr/lib64/python2.7/site-packages/salt/modules/ebuild.py", line 1059, in check_extra_requirements
                  cpv = _porttree().dbapi.xmatch('bestmatch-visible', atom)
                File "/usr/lib64/python2.7/site-packages/portage/dbapi/porttree.py", line 835, in xmatch
                  mydep = dep_expand(origdep, mydb=self, settings=self.settings)
                File "/usr/lib64/python2.7/site-packages/portage/proxy/objectproxy.py", line 31, in __call__
                  return result(*args, **kwargs)
                File "/usr/lib64/python2.7/site-packages/portage/dbapi/dep_expand.py", line 35, in dep_expand
                  mydep = Atom(mydep, allow_repo=True)
                File "/usr/lib64/python2.7/site-packages/portage/dep/__init__.py", line 1366, in __init__
                  use = _use_dep(use_str[1:-1].split(","), eapi_attrs)
                File "/usr/lib64/python2.7/site-packages/portage/dep/__init__.py", line 855, in __init__
                  raise InvalidAtom(_("Invalid use dep: '%s'") % (x,))
              InvalidAtom: Invalid use dep: ' importd'
     Started: 21:53:35.925124
    Duration: 999.249 ms
     Changes:
```
2016-07-17 13:52:30 -06:00
Krzysztof Pawlowski
bdf3926037 Add valid function to mine module.
Function list correctly configured mine functions.
2016-07-17 20:57:46 +02:00
Martin Hoefling
ddd0c707dd Loop over updated keys in non recursive update
Remove dict.update and always use loop because this is failing for
 NamespacedDictWrapper.
2016-07-17 13:20:19 +02:00
Nicole Thomas
6ea0ce6a38 Merge pull request #34723 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-07-16 16:22:26 -06:00