valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,484 Commits 24 Branches 182 Tags 341 MiB
757fde70c6
Commit Graph

86484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
9aa4687ab9
Merge pull request #48117 from twangboy/fix_48026 
service.disabled on Windows
 2018-06-26 19:35:58 -04:00
rallytime
5e56615e00
Trigger review requests for team-ssh for roster files 2018-06-26 17:58:57 -04:00
Ch3LL
47845ba810
Update release versions for the 2017.7 branch 2018-06-26 15:51:46 -04:00
Nicole Thomas
caf630487c
Merge pull request #48207 from rallytime/bp-48189 
Back-port #48189 to 2017.7
 2018-06-25 15:26:55 -04:00
rallytime
352fe33fd6
Separate set_result() to a new line apart from Future() call 2018-06-25 15:24:45 -04:00
Nicole Thomas
06a927b2aa
Merge pull request #48293 from rallytime/bp-47453 
Back-port #47453 to 2017.7
 2018-06-25 15:06:41 -04:00
Thomas Jackson
c0180ff33d
Properly configure syndic in test case 
Without this option we aren't really a syndic and it won't wait
 2018-06-25 10:26:30 -04:00
Thomas Jackson
d0a98534a9
Properly wait on returns in saltnado 
This was broken because the behavior was to simply check the ckminions
and wait for only those returns to complete. This works assuming
ckminions is accurate (which there are many cases where it isn't, such
as syndics).

_disbatch_local's waiting on returns needs to match LocalClient's
behavior (namely that in get_iter_returns). This means we are allowed to
return when (1) we have waitged the min_wait_time (0 if not a syndic)
(2) no minions are running the job (3) all minions we saw running it are
done running the job. The only method allowed for earlier termination is
if the gather_job_timeout is exceeded.

Fixes #42659
 2018-06-25 10:25:38 -04:00
Daniel Dao
e96ab6778e
dont reset system locale when running rabbitmqctl commands 
Observe the errors with rabbitmq 3.7.3.
```
ERROR: RabbitMQ command failed: warning: the VM is running with native name encoding of latin1 which may cause Elixir to malfunction as it expects utf8.
Please ensure your locale is set to UTF-8 (which can be verified by running "locale" in your shell)
```
 2018-06-25 10:13:40 -04:00
rallytime
e9d09e0375
Use old is_windows utils path on 2017.7 2018-06-25 10:06:37 -04:00
Nicole Thomas
95ef006e00
Merge pull request #48219 from zer0def/lxc-bootstrap-fixes 
Fix: LXC legacy configuration key warnings falsely report errors during state change
 2018-06-25 09:46:06 -04:00
Nicole Thomas
3327181507
Merge pull request #48234 from dwoz/thin_dir 
Fix py2 thin dir issues
 2018-06-25 09:33:01 -04:00
zer0def
c77058560b
Merge branch '2017.7' into lxc-bootstrap-fixes 2018-06-23 09:49:02 +02:00
Nicole Thomas
83d7d286c4
Merge pull request #48080 from lusche/2017.7 
Bugfix #47984 messed up cert serial
 2018-06-22 14:00:13 -04:00
Nicole Thomas
bccb4dcd46
Merge pull request #48232 from gtmanfred/cloud 
do not expand kwargs for cloud.action
 2018-06-22 11:49:20 -04:00
Nicole Thomas
056f43f663
Merge pull request #48238 from mirceaulinic/fix-sdb-cache 
SDB cache module: AttributeError: 'Cache' object has no attribute 'set'
 2018-06-22 11:37:21 -04:00
Nicole Thomas
731ec0a11a
Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs 
Add "sync_mods" argument to state.apply/state.sls
 2018-06-21 15:57:02 -04:00
Erik Johnson
052ae83c4b
Update versionchanged 2018-06-21 14:19:40 -05:00
Nicole Thomas
0bae927048
Merge pull request #48249 from rallytime/2017.7.7-release-notes-update 
Update release notes for 2017.7.7
 2018-06-21 14:30:38 -04:00
Nicole Thomas
8e06471817
Merge pull request #48242 from asnell/asnell-patch-1 
Add sample list data via command line pillar
 2018-06-21 14:27:40 -04:00
rallytime
36032c8ee7
Update release notes for 2017.7.7 2018-06-21 13:02:25 -04:00
Erik Johnson
8b1bd0eda2
Update test to reflect changed argument name 2018-06-21 11:39:12 -05:00
asnell
f66bf60073
Add sample list data via command line pillar 2018-06-21 08:44:14 -04:00
Mircea Ulinic
51e5fbfa1d SDB cache module: AttributeError: 'Cache' object has no attribute 'set' 
I was looking at the
[SDB cache module](https://docs.saltstack.com/en/latest/ref/sdb/all/salt.sdb.cache.html#module-salt.sdb.cache)
and it appears that there's a little bug (probably caused by some recent changes
in the caching system):

```bash
Exception occurred in runner sdb.set: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/client/mixins.py", line 382, in _low
    data['return'] = self.functions[fun](*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/runners/sdb.py", line 42, in set_
    return salt.utils.sdb.sdb_set(uri, value, __opts__, __utils__)
  File "/usr/lib/python2.7/dist-packages/salt/utils/sdb.py", line 77, in sdb_set
    return loaded_db[fun](query, value, profile=profile)
  File "/usr/lib/python2.7/dist-packages/salt/sdb/cache.py", line 72, in set_
    cache.set(profile['bank'], key=key, value=value)
AttributeError: 'Cache' object has no attribute 'set'
```

The `set` method doesn't exist: https://github.com/saltstack/salt/blob/2017.7.7/salt/sdb/cache.py#L72

This change is enough to fix the issue:

```bash
bar
```

Moreover it seems to fix both the Execution Module and the Runner, as the Runner
simply invokes the same code, via ``salt.utils.sdb``.
 2018-06-21 08:32:59 +00:00
Sebastian Gerlach
917dc985fc #47984 remove the line completly 2018-06-21 08:01:37 +02:00
Sebastian Gerlach
ba12ee947b Merge branch '2017.7' of https://github.com/saltstack/salt into 2017.7 2018-06-21 07:56:20 +02:00
Daniel A. Wozniak
70c603451b
Fix py2 thin dir issues 2018-06-20 17:16:30 -07:00
Nicole Thomas
a172f9de84
Merge pull request #48226 from terminalmage/fix-alias-docstring 
2 fixes for when Salt is installed using -OO
 2018-06-20 16:12:33 -04:00
Nicole Thomas
c6a0207cae
Merge pull request #48227 from Ch3LL/fix_win_tests 
Skip new sha256 files on repo.saltstack.com/windows
 2018-06-20 16:12:08 -04:00
Daniel Wallace
d108112e1a
do not expand kwargs for cloud.action 2018-06-20 14:34:53 -05:00
Ch3LL
236773e3e9
Skip new sha256 files on repo.saltstack.com/windows 2018-06-20 14:28:31 -04:00
Erik Johnson
fb237272f5
Don't display "None" in SaltInvocationError when Salt installed using -OO 
When there is no docstring, just omit it from the return instead.
 2018-06-20 11:07:14 -05:00
Erik Johnson
90c90f5d5c
Fix docstring construction in alias_function when Salt installed using -OO 
This removes the docstring, so fun.__doc__ is None, which raises an
exception when we try to concatenate these.
 2018-06-20 10:45:47 -05:00
zer0def
d63cf3f072 Fixes another case of legacy configuration key usage warning getting in the way of changing container's state. 2018-06-19 23:33:44 +02:00
Nicole Thomas
6929423528
Merge pull request #48131 from bowmanjd-lms/fix-apk-python3 
Fix py3-incompatible dict.keys()[x] call in apk.py
 2018-06-19 14:19:02 -04:00
Nicole Thomas
868c17377f
Merge pull request #48185 from DSRCorporation/bugs/47901_future_done_exception 
Don't call .exception() on future unless it's done.
 2018-06-19 14:16:26 -04:00
Nicole Thomas
80a3e37c2e
Merge pull request #48192 from twangboy/fix_pip_version_2017.7 
Use the --disable-pip-version-check option (2017.7)
 2018-06-19 14:13:11 -04:00
Daniel Wallace
b965d6c9b3
If pip binary is passed to bin_env, use that pip binary 
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
 2018-06-19 14:09:11 -04:00
Nicole Thomas
12e2b8882a
Merge pull request #48201 from zer0def/lxc-bootstrap-fixes 
Fixes to LXC bootstrap when alternate lxcpath is provided.
 2018-06-19 08:56:39 -04:00
Dmitry Kuzmenko
5f63316311
Merge branch '2017.7' into bugs/47901_future_done_exception 2018-06-19 15:34:33 +03:00
zer0def
6f6d3d40d4 Take lxcpath into account when bootstrapping new containers. Version comparison fixes. 2018-06-19 12:57:12 +02:00
Nicole Thomas
e079fce38d
Merge pull request #48190 from terminalmage/fix-vfstab-test 
Fix mount.vfstab unit test
 2018-06-18 17:47:54 -04:00
Nicole Thomas
c8b9cec986
Merge pull request #48115 from KaiSforza/pr-lint-2017 
Add jenkinsfiles to define tests in 2017
 2018-06-18 17:27:39 -04:00
twangboy
59ae2cc5fc
Use --disable-pip-version-check for build_env_#.ps1 2018-06-18 13:15:03 -06:00
Nicole Thomas
fc1752b721
Merge pull request #48174 from terminalmage/docker-update-mine 
Add docker.update_mine config option
 2018-06-18 15:04:53 -04:00
Erik Johnson
8d70d14362
Fix mount.vfstab unit test 
This test was calling mount.fstab() instead of mount.vfstab()
 2018-06-18 13:21:40 -05:00
Dmitry Kuzmenko
9f2dbf94cb
Don't call .exception() on future unless it's done. 2018-06-18 17:36:14 +03:00
Nicole Thomas
cfd21ed22c
Merge pull request #48172 from rallytime/2017.7.7-release-notes 
Update release notes for 2017.7.7
 2018-06-18 09:07:24 -04:00
Jonathan Bowman
f5d2835299
Merge branch '2017.7' into fix-apk-python3 2018-06-18 06:04:39 -04:00
Erik Johnson
9af09e0127
Mock config.get due to changes in _refresh_mine_cache 2018-06-18 00:05:25 -05:00