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
83,054 Commits 24 Branches 182 Tags 341 MiB
25c8190e48
Commit Graph

83054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
1340c15ce7 Add general usage instructions 2017-07-28 15:38:14 -06:00
twangboy
19f34bda55 Fix docs, formatting 2017-07-28 15:06:52 -06:00
twangboy
b17495c9c8 Fix problem with list when install=True 2017-07-28 14:46:27 -06:00
Erik Johnson
fcf45889dd Fix unicode constructor in custom YAML loader 
2e7f743 added this in the wrong place, it should not have been added
within the if block since we will _always_ want this constructor
available.
 2017-07-28 15:35:30 -05:00
Nicole Thomas
b7cd30d3ee Merge pull request #42621 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-28 13:45:50 -06:00
garethgreenaway
d48749b476 Merge pull request #42618 from rallytime/bp-41690 
Back-port #41690 to 2017.7
 2017-07-28 12:27:10 -07:00
garethgreenaway
e671242a4f Merge pull request #42619 from rallytime/bp-42589 
Back-port #42589 to 2017.7
 2017-07-28 12:26:35 -07:00
rallytime
58dcb58a47 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/dockerng.py
  - tests/unit/states/dockerng_test.py
 2017-07-28 11:39:38 -06:00
twangboy
0c9e40012b Remove deprecation, add logic to state.py 2017-07-28 11:39:02 -06:00
twangboy
464ec34713 Fix another instance of runas_passwd 2017-07-28 11:20:48 -06:00
twangboy
18d6ce4d55 Add global vars to cmd.call 2017-07-28 11:15:37 -06:00
twangboy
6c71ab6f80 Remove runas and runas_password after state run 2017-07-28 11:03:21 -06:00
Slawomir Bojarski
5c945f10c2 Fix debug message in "boto_cfn._validate" function. 2017-07-28 12:57:10 -04:00
Slawomir Bojarski
181a1beecc Fixed error reporting in "boto_cfn.present" function. 
Fixes #41433
 2017-07-28 12:56:49 -04:00
Nicole Thomas
a50fe5433a Merge pull request #42595 from gtmanfred/2017.7.1 
make sure to pass arg as well
 2017-07-28 10:21:57 -06:00
Andreas Thienemann
cd5eb93903 Fix ssh-salt calls with scan roster for uncached clients 
When using salt-ssh with a scanning roster uncached minions
lead to a traceback indicating an error creating the Single()
object.

Fix this error by ensuring that the target dictionary always
contains a host key and the appropriate value.

Fixes #42588
 2017-07-28 10:19:22 -06:00
twangboy
4ea264e3db Change to runas_password in docs 2017-07-28 10:16:38 -06:00
twangboy
61aba35718 Deprecate password, make runas_password a named arg 2017-07-28 10:12:44 -06:00
Nicole Thomas
cbf752cd73 Merge pull request #42515 from gtmanfred/backslash 
Allow not interpreting backslashes in the repl
 2017-07-28 10:00:08 -06:00
m03
22c6a7c7ff Improve output precision 2017-07-28 09:55:14 -06:00
m03
ee4ea6b860 Fix #34245 ini.options_present reporting changes 2017-07-28 09:55:14 -06:00
Nicole Thomas
7d385f8bdc Merge pull request #42006 from redmatter/fix-dockerng-network-matching-2017.7 
Fix dockerng.network_* name matching
 2017-07-28 09:52:51 -06:00
Nicole Thomas
ee8aee1496 Merge pull request #42616 from amendlik/sync-clouds 
Sync cloud modules
 2017-07-28 09:40:36 -06:00
Gareth J. Greenaway
2e132daa73 Slight update to formatting 2017-07-28 08:33:21 -07:00
Nicole Thomas
f83960c02a Lint: Remove extra line at end of file. 2017-07-28 09:13:59 -06:00
Adam Mendlik
ab21bd9b5b Sync cloud modules when saltutil.sync_all is run 
Fixes #12587
 2017-07-28 06:00:16 -06:00
Andrew Bulford
c7d364ec56 Add regression tests for #41982 
These test the scenarios where another network with a similar name
already exists, verifying that absent doesn't attempt to remove a
network which isn't specified, and present still attempts to create the
specified network despite a similarly named network already being present.
 2017-07-28 10:41:44 +01:00
Andrew Bulford
d31f2913bd Fix broken unit test test_network_absent 
This started failing following commit 515c612, which relied on the
'Name' key being present in the return value of docker.networks -
as the mock didn't have this set the test started failing.
 2017-07-28 09:57:45 +01:00
Andrew Bulford
d42f781c64 Add trace logging of docker.networks result 
Added during debugging of failing test to determine what
docker.networks is expected to return, keeping as it seems useful.
 2017-07-28 09:55:05 +01:00
garethgreenaway
3b583330de Merge pull request #42597 from rallytime/bp-42590 
Back-port #42590 to 2017.7.1
 2017-07-27 17:20:00 -07:00
garethgreenaway
76f1e53e10 Merge pull request #42598 from rallytime/bp-42411 
Back-port #42411 to 2017.7.1
 2017-07-27 17:19:12 -07:00
twangboy
41f0f75a06 Add new var to list, change to runas_password 2017-07-27 18:01:26 -06:00
garethgreenaway
549495831f Merge pull request #42586 from gdubroeucq/2016.11 
[Fix] yumpkg.py: add option to the command "check-update"
 2017-07-27 16:51:59 -07:00
Nicole Thomas
e2dd443002 Merge pull request #42601 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-27 16:32:06 -06:00
Nicole Thomas
22eea389fa Merge pull request #42290 from isbm/isbm-module_run_parambug_42270_217 
Backport of #42270
 2017-07-27 16:30:05 -06:00
twangboy
b9c91eba60 Add runas_passwd as a global for states 2017-07-27 15:46:58 -06:00
Nicole Thomas
6b45debf28 Merge pull request #41988 from redmatter/fix-dockerng-network-matching 
Fix dockerng.network_* name matching
 2017-07-27 15:25:06 -06:00
Daniel Wallace
cc4e45656d Allow not interpreting backslashes in the repl 
Without this, if append or prepend is used with file.replace, the backslashes
will not be interpreted when appending the file, but the next time the state is
run, the backslashes could be interpreted and removed from the line.
 2017-07-27 14:21:58 -06:00
Gareth J. Greenaway
74bae13939 Small update to something I missed in the first commit. Updating tests to also test for pillar values. 2017-07-27 13:19:48 -07:00
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
 2017-07-27 14:00:15 -06:00
Mike Place
4c20f1cfbb Merge pull request #42251 from twangboy/unit_win_test_win_ip 
Fix `unit.modules.test_win_ip` for Windows
 2017-07-27 14:22:03 -05:00
Richard Clark
190cdb8693 Fix file.managed check_cmd file not found - Issue #42404 2017-07-27 13:13:38 -06:00
Mike Place
2985e4c0e6 Merge pull request #42255 from twangboy/win_unit_test_win_system 
Fix `unit.modules.test_win_system` for Windows
 2017-07-27 14:12:41 -05:00
Marion Duprey
8818b06f22 Fix missing tornado import 
After upgrading my master (now in 2017.7), salt-api stopped working with the following stacktrace:

```
Tornado /usr/local/lib/python2.7/dist-packages/tornado/__init__.pyc
Process salt.loaded.int.netapi.rest_tornado.start:
Traceback (most recent call last):
  File "/usr/lib/python2.7/multiprocessing/process.py", line 258, in _bootstrap
    self.run()
  File "/usr/lib/python2.7/multiprocessing/process.py", line 114, in run
    self._target(*self._args, **self._kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/netapi/rest_tornado/__init__.py", line 118, in start
    http_server = tornado.httpserver.HTTPServer(get_application(__opts__), **kwargs)
AttributeError: 'module' object has no attribute 'httpserver'
```

Reproduced with tornado 4.2 and 4.5

This PR fixes the error above.
 2017-07-27 13:10:16 -06:00
Nicole Thomas
4b16109122 Merge pull request #42339 from isbm/isbm-jobs-scheduled-in-a-future-bsc1036125 
Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125)
 2017-07-27 13:05:50 -06:00
Nicole Thomas
6c5a7c604a Merge pull request #42077 from vutny/fix-jobs-scheduled-with-whens 
Fix scheduled job run on Master if `when` parameter is a list
 2017-07-27 13:04:22 -06:00
Mike Place
f9cb536589 Merge pull request #42414 from vutny/unify-hash-params-format 
DOCS: unify hash sum with hash type format
 2017-07-27 13:48:40 -05:00
Mike Place
a573386260 Merge pull request #42528 from twangboy/win_fix_pkg_state 
Namespace `cmp_to_key` in the pkg state for Windows
 2017-07-27 13:30:22 -05:00
Daniel Wallace
8f73804b24 make sure to pass arg as well 2017-07-27 12:28:02 -06:00
Gareth J. Greenaway
928a4808dd Updating the superseded and deprecated decorators to work when specified as pillar values. 2017-07-27 11:25:23 -07:00