Commit Graph

71300 Commits

Author SHA1 Message Date
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
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
Nicole Thomas
2a3df50223 Merge pull request #34724 from rallytime/test-fix-34270
Update mock value to match change in #34270.
2016-07-16 14:06:04 -06:00
Nicole Thomas
4acb2a6044 Merge pull request #34270 from mattlindesay/patch-1
Update chkconfig for xinetd based services
2016-07-16 14:05:52 -06:00
rallytime
f667b936e5 Update mock value to match change in #34270.
Fixes the failing test in #34270
2016-07-16 14:03:37 -06:00
Mike Place
1b3742c41b Merge pull request #34599 from meaksh/salt-snapper-module
Snapper execution module and state for Salt
2016-07-16 13:43:06 -06:00
rallytime
b9e0bd1918 Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-16 13:24:10 -06:00
Nicole Thomas
40626d786a Merge pull request #34720 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-07-16 13:22:28 -06:00
Mike Place
e918aba3c3 Merge pull request #34704 from babilen/influxdb-current
Influxdb current
2016-07-16 12:39:22 -06:00
Mike Place
91ed2e7a48 Merge pull request #34708 from adelcast/dev/adelcast/beacon_update_grains
beacons: update __grains__ variable on each tick
2016-07-16 12:34:28 -06:00
rallytime
c2130d5a04 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-16 12:29:54 -06:00
Nicole Thomas
8ae4b104ff Add versionadded to "special" option in cron.present state (#34707)
Fixes #34661
2016-07-16 12:23:43 -06:00
Collin Richards
eab87656de NILinuxRT fix timezone module (#34710)
Fix mistake in commit:
57f90d2bc23e250b240a37228b3793e2b7875b18

NILinuxRT uses /etc/localtime not /etc/timezone

Signed-off-by: Collin Richards <collin.richards@ni.com>
2016-07-16 12:19:25 -06:00
Wolodja Wentland
21004e02d9 Add state module to manage InfluxDB databases 2016-07-16 09:46:44 +02:00
Wolodja Wentland
932fc681e1 Add state module to manage InfluxDB users 2016-07-16 09:46:44 +02:00
Wolodja Wentland
00351cbb2e Add influx module for InfluxDB 0.9+ 2016-07-16 09:46:44 +02:00
Wolodja Wentland
8e5cdabf16 Normalise function argument formatting
This normalises the style of long function argument lists to use
continuation lines with 'hanging indents' that align with the opening
delimiter as discussed in PEP8.
2016-07-16 09:46:44 +02:00
Wolodja Wentland
f19be2641f Adapt influx08 module for influxdb-python >= 1.0.0
This allows the influx08 module to work with influxdb-python versions
after 1.0.0 and specifically uses the influxdb08.InfluxDBClient shipped
therein.

It furthermore removes code that was meant to provide 0.9 compatibility
in the same module and simplifies user/cluster admin user management
logic.
2016-07-16 09:46:44 +02:00
Wolodja Wentland
87b54170aa Rename InfluxDB states and modules for 0.8
InfluxDB versions newer than 0.8 introduced significant changes in
database concepts, user administration and Python API.

We therefore decided to rename the old InfluxDB states to 'influxdb08*'
and to reserve the 'influxdb' name for InfluxDB 0.9+ compatible states
and modules.
2016-07-16 09:46:44 +02:00
Mike Place
a6c21bac14 Merge pull request #34711 from cachedout/lint_dockerng
Quick lint of dockerng
2016-07-15 16:20:34 -06:00
Mike Place
b9732eeffb Quick lint of dockerng 2016-07-15 16:19:35 -06:00
Mike Place
b11fd8ef6a Merge pull request #34484 from dmacvicar/docker_images
[WIP] Creating Docker images with pure Salt and running Salt commands inside containers
2016-07-15 16:17:59 -06:00
Mike Place
868b589cb3 Merge pull request #34709 from techhat/thorexpr
Change from fnmatch to expr_match
2016-07-15 15:39:16 -06:00
Joseph Hall
8be793b2ce Change from fnmatch to expr_match 2016-07-15 15:35:23 -06:00
Alejandro del Castillo
e9382d4e2f beacons: update __grains__ variable on each tick
The beacon's __grains__ variable is set at load time, then never
refreshed. This is inconvenient as it limits the scope of what can be
done in a beacon (can't rely on grain values that change).

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2016-07-15 21:34:54 +00:00
Mike Place
b656c48e94 Merge pull request #34677 from santiwst/fix_no_error_when_no_permission
fix no error message when no permission on the log folder
2016-07-15 15:26:10 -06:00
Mike Place
706e99139d Merge pull request #34685 from techhat/simpletypes
Switch simple_types_filter() to salt.utils
2016-07-15 15:25:23 -06:00
Mike Place
99e638ab40 Merge pull request #34686 from rallytime/fix-doc-test
CLI Example doc additions to fix the sysmod test failure
2016-07-15 15:22:07 -06:00
Mike Place
08d00f3a61 Merge pull request #34689 from Azidburn/fix_pkg_sources
fix second run problems with pkg.installed using sources
2016-07-15 15:19:39 -06:00
Mike Place
51fce770a5 Merge pull request #34696 from isbm/isbm-zypper-product-boolean-values-2016.3
Bugfix: Zypper `pkg.list_products` returns False on some empty values (2016.3)
2016-07-15 15:18:21 -06:00
Mike Place
67cb289dde Merge pull request #34690 from vutny/event-return-white-blacklist-glob-match
[develop] Glob matching patterns in `event_return_whitelist` and `event_return_blacklist`
2016-07-15 15:11:11 -06:00
Mike Place
4cb1ded520 Merge pull request #34695 from isbm/isbm-zypper-product-boolean-values
Bugfix: Zypper `pkg.list_products` returns False on some empty values (2015.8)
2016-07-15 15:08:00 -06:00
Mike Place
cfeea60ecc Merge pull request #34697 from isbm/isbm-zypper-product-boolean-values-develop
Bugfix: Zypper `pkg.list_products` returns False on some empty values
2016-07-15 15:03:26 -06:00
Mike Place
bca859e57a Merge pull request #34693 from richardscollin/dev/corichar/hostname-fix
Add NILinuxRT mod_hostname support
2016-07-15 15:02:03 -06:00
Mike Place
39f1a8798d Merge pull request #34694 from vutny/smtp-return-events
Add event support for ``smtp`` returner
2016-07-15 14:59:08 -06:00
Mike Place
5c3ff22283 Merge pull request #34698 from techhat/thoriumstamp
Add timestamping to reg.list
2016-07-15 14:56:37 -06:00
Mike Place
bb287cd3dc Merge pull request #34699 from richardscollin/dev/corichar/fix-docs
system.py: Make FixedOffset class private
2016-07-15 14:52:22 -06:00
Mike Place
45045f6900 Merge pull request #34702 from farcaller/fixtags
Fixed dockerng.list_tags
2016-07-15 14:50:35 -06:00
Vladimir Pouzanov
032e35a28e Fixed dockerng.list_tags 2016-07-15 20:29:20 +01:00
Collin Richards
a5af4120ce system.py: Make FixedOffset class private
The FixedOffset is a private class and was not prefixed with an
underscore. Prefixing it with and underscore stops the generation of
public documentation for this class.

Signed-off-by: Collin Richards <collin.richards@ni.com>
2016-07-15 13:29:29 -05:00
Joseph Hall
e3586fe42c Properly format usage block 2016-07-15 09:36:50 -06:00