Nicole Thomas
904c0da893
Merge branch '2017.7' into status
2017-12-06 12:51:52 -05:00
Nicole Thomas
d6c37ea19c
Merge pull request #44827 from mz-bmcqueen/2017.7
...
add more clone options to virtualbox and add better dhcp handling
2017-12-06 10:02:22 -05:00
Nicole Thomas
019169ed61
Merge pull request #44824 from Ch3LL/spm_args
...
Add spm -y and -f arg integration tests
2017-12-05 16:49:31 -05:00
Ch3LL
d8f81d2e4d
fix pylint
2017-12-05 14:39:36 -05:00
Nicole Thomas
59b930668c
Merge pull request #44742 from Ch3LL/cloud_action_test
...
Add salt-cloud action rename integration test
2017-12-05 12:44:49 -05:00
mz-bmcqueen
4ead3014b7
Merge branch '2017.7' into 2017.7
2017-12-05 09:27:48 -08:00
Nicole Thomas
10442d9211
Merge pull request #44771 from garethgreenaway/42676_backport_44071
...
[2017.7] Back porting #44071
2017-12-05 12:16:05 -05:00
Nicole Thomas
23d151b40a
Merge pull request #44784 from rallytime/merge-2017.7-1
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-05 12:13:48 -05:00
Brian McQueen
b7ce154014
Merge branch '2017.7' of https://github.com/mz-bmcqueen/salt into 2017.7
2017-12-04 22:48:22 -08:00
Brian McQueen
c2018c9021
fix pylint complaints
2017-12-04 22:47:37 -08:00
mz-bmcqueen
2f80f431b3
Merge branch '2017.7' into 2017.7
2017-12-04 14:47:47 -08:00
Brian McQueen
c38ff74261
add more clone options to virtualbox and add better dhcp handling
2017-12-04 14:36:19 -08:00
Ch3LL
951d09ca2f
remove unnecessary try/except block
2017-12-04 16:18:01 -05:00
Ch3LL
c329ced7ee
Add salt-cloud action rename integration test
2017-12-04 16:16:08 -05:00
Ch3LL
61ac5cf157
Add spm -y and -f arg integration tests
2017-12-04 16:06:14 -05:00
Nicole Thomas
ec2a8b2032
Merge branch '2017.7' into 42676_backport_44071
2017-12-04 11:52:38 -05:00
Nicole Thomas
4643a112e7
Merge pull request #44788 from kris-anderson/example-yaml-of-influxdb-user-state
...
Example yaml of influxdb_user state
2017-12-04 09:28:45 -05:00
Kris Anderson
afd23d058c
converted yaml example to use 2 spaces
2017-12-03 21:14:12 -08:00
Nicole Thomas
4ebac09f60
Merge pull request #44735 from gracinet/42713_backport_2017.7
...
Backported issue #42713 to 2017.7
2017-12-03 20:43:22 -05:00
Nicole Thomas
06ce7b7328
Merge pull request #44766 from twangboy/win_fix_test_process
...
Fix `unit.utils.test_process` for Windows
2017-12-02 08:15:52 -05:00
twangboy
a5737e8fc3
Fix lint errors
2017-12-01 16:45:18 -07:00
twangboy
be96de09cc
Fix pickling error by decorating
2017-12-01 16:45:18 -07:00
Thomas S Hatch
f8b8a8966d
Merge pull request #44716 from rallytime/bp-44605
...
Back-port #44605 to 2017.7
2017-12-01 16:12:23 -07:00
Thomas S Hatch
8ed6287762
Merge pull request #44781 from cloudflare/thorium-fix-41869
...
Correct the thorium runner
2017-12-01 15:55:51 -07:00
Nicole Thomas
52596be102
Merge pull request #44466 from twangboy/win_fix_test_disk
...
Fix `unit.modules.test_disk` for Windows
2017-12-01 17:31:41 -05:00
Gareth J. Greenaway
180971203e
Updating minion to respond to list_available events for beacons
2017-12-01 12:15:42 -08:00
Gareth J. Greenaway
db6fcefe62
Adding list_available which is used by the add function to verify that a becaon exists.
2017-12-01 12:15:42 -08:00
Gareth J. Greenaway
e9e0318bc6
Backporting fixes related to having beacons in pillar from #44071
2017-12-01 12:15:42 -08:00
rallytime
3d9eafc4bd
Lint: Remove extra empty lines at end of files
2017-12-01 14:46:27 -05:00
Kris Anderson
29e410c1ea
added a code-block example of how the yaml should be formatted
2017-12-01 11:31:08 -08:00
twangboy
5615862f23
Fix some lint
2017-12-01 10:25:48 -07:00
twangboy
627d5ab0c9
Mock salt.utils.which
...
cmd.run return values are mocked
2017-12-01 10:25:48 -07:00
twangboy
e5a96fe00f
Skip test_fstype on Windows
...
no lsblk on Windows
2017-12-01 10:25:48 -07:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/reg.py
- salt/modules/state.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/utils/__init__.py
- tests/integration/modules/test_file.py
- tests/integration/output/test_output.py
- tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
Mircea Ulinic
83c73a69cb
Instance the Runner class instead of the RunnerClient as we're running on the Master
2017-12-01 15:50:07 +00:00
Nicole Thomas
b9ad4bba2d
Merge pull request #44719 from rallytime/bp-44667
...
Back-port #44667 to 2017.7
2017-12-01 10:20:48 -05:00
Nicole Thomas
d23192c492
Merge pull request #44747 from gtmanfred/roster_defaults
...
use a copy so roster_defaults doesn't mangle
2017-12-01 10:13:47 -05:00
Nicole Thomas
97e0cf569c
Merge pull request #44699 from jfindlay/attr_file
...
utils/files.py remove temp file upon move failure
2017-12-01 10:03:53 -05:00
Nicole Thomas
20f20ad9e1
Merge pull request #44717 from garethgreenaway/44694_at_absent_failing_to_find_jobs
...
[2017.7] Fixes to at module
2017-12-01 09:37:05 -05:00
Nicole Thomas
6e61aa787f
Merge pull request #44695 from gtmanfred/pop
...
pop None for runas and runas_password
2017-12-01 09:35:00 -05:00
Nicole Thomas
7434e0afdf
Merge pull request #44714 from rallytime/fix-44556
...
Allow --static option to display state runs with highstate output
2017-12-01 09:31:18 -05:00
Mircea Ulinic
b72b7c5402
Correct the thorium runner
...
The thorium system is currently unable to invoke any runner (at all).
This is due to the fact that we go thorough the State system
which builds the "chunks" from the state-formatted data:
https://github.com/saltstack/salt/blob/develop/salt/thorium/__init__.py#L166
For example, the following Thorium state:
dummy:
runner.cmd
- fun: test.sleep
- kwargs:
s_time: 1
Will produce the following state chunks:
[{'name': 'dummy', 'state': 'runner', '__id__': 'dummy', 'kwargs': OrderedDict([('s_time', 1)]), 'fun': 'cmd', '__env__': 'base', '__sls__': u'dummy', 'order': 10000}]
The value of the `fun` field from the state chunks will override
the value specified in the Thorisum state. For the example above,
instead of execution the `test.sleep` runner function, it will
try instead to execute the `cmd` runner function, which will,
of course, fail.
In order to preserve the value of the actual function requested by
the user, we must rename `fun` to `func` to avoid this collision,
which is also in-line with the equivalent `local.cmd` for local
functions: https://github.com/saltstack/salt/blob/develop/salt/thorium/local.py#L14
The state chunks in this case will be:
[{'name': 'dummy', 'state': 'runner', '__id__': 'dummy', 'func': 'test.sleep', 'kwargs': OrderedDict([('s_time', 1)]), 'fun': 'cmd', '__env__': 'base', '__sls__': u'dummy', 'order': 10000}]
Which will correctly try to execute the requested runner function.
2017-12-01 14:12:23 +00:00
Justin Findlay
9e5a40ea7c
Merge branch '2016.11' into attr_file
2017-11-30 16:34:43 -08:00
Gareth J. Greenaway
1f2b3c5f46
Merge branch '2017.7' into 44694_at_absent_failing_to_find_jobs
2017-11-30 16:31:57 -08:00
Mike Place
0efb90b6f7
Merge branch '2017.7' into pop
2017-11-30 16:52:44 -07:00
Daniel Wallace
911411ed8f
add unit test
2017-11-30 13:48:30 -07:00
Mike Place
20391c54c0
Merge pull request #44725 from whytewolf/1919_cmd.run_no_daemons
...
document note suggesting systemd-run --scope with cmd.run_bg
2017-11-30 12:18:05 -07:00
Nicole Thomas
85451ae977
Merge pull request #44760 from cloudflare/px-grains-set-42300
...
Fix the grains.setvals execution function when working with proxy minions
2017-11-30 13:27:02 -05:00
Gareth J. Greenaway
3bb385b44e
removing debugging logging
2017-11-30 10:16:12 -08:00
Nicole Thomas
06fb80b69c
Merge pull request #44640 from vutny/fix-cron-schedule-splay
...
Fix #44583 : splay with cron-like scheduled jobs
2017-11-30 10:30:40 -05:00
