Nicole Thomas
898bf26413
Merge pull request #44955 from garethgreenaway/scheduler_run_after_skip
...
[oxygen] Scheduler run after skip
2017-12-13 09:32:28 -05:00
Nicole Thomas
db58345abb
Merge pull request #44956 from terminalmage/fix-get_pidfile
...
Avoid traceback when bogus value in pidfile
2017-12-13 09:30:11 -05:00
Nicole Thomas
8d6c1c8cc6
Merge pull request #44952 from gtmanfred/oxygen
...
move oxygen kitchen to use the oxygen salt-jenkins
2017-12-13 09:28:25 -05:00
Erik Johnson
ef749abfc6
No need to manually do connect_pub, use listen=True in run_job
2017-12-13 03:05:57 -06:00
Erik Johnson
2ac70cfab5
Fix a race condition in manage runner
...
The runner was not connecting the client event listener to the event
bus. This meant that all events between the `client.run_job()` and when
`client.get_cli_event_returns()` began polling for events would be lost.
Before `get_cli_event_returns` (via LocalClient's `get_iter_returns`)
gets around to polling for events, it first checks to see if the job
cache has a record of the jid it's querying. When using a custom
returner for the job_cache, one which has even a little bit of latency,
return events from minions may sneak past before the jid lookup is
complete, meaning that `get_iter_returns` will not return them and the
manage runner will assume the minion did not respond.
Connecting to the event bus before we run the test.ping ensures that we
do not miss any of these events.
2017-12-13 03:05:57 -06:00
Nicole Thomas
990c6284b2
Merge pull request #44678 from isbm/isbm-master-autodiscovery
...
Master/Minion auto-discovery
2017-12-12 18:42:09 -05:00
Erik Johnson
d66f3a98d7
Avoid traceback when bogus value in pidfile
2017-12-12 17:10:47 -06:00
Gareth J. Greenaway
7612a5dd14
Adding test for test_run_after_skip_range. Adding some additional documentation for new scheduler functions.
2017-12-12 14:19:07 -08:00
Gareth J. Greenaway
6da25648cb
Adding the ability to have a job run immediately after a skip_during_range has finished.
2017-12-12 14:19:06 -08:00
Mike Place
66ce508a93
Merge pull request #44823 from garethgreenaway/scheduler_tests
...
Scheduler tests
2017-12-12 15:05:25 -07:00
Nicole Thomas
e8e3b3c8ff
Merge pull request #44945 from gtmanfred/2017.7
...
Fix handling of effective acls
2017-12-12 16:49:33 -05:00
Nicole Thomas
47dc7b7afb
Merge pull request #44942 from rallytime/readme-saltconf-update
...
Update README with SaltConf18 info
2017-12-12 16:47:23 -05:00
Daniel Wallace
0f05d8c6bb
move oxygen kitchen to use the oxygen salt-jenkins
2017-12-12 14:08:32 -07:00
Anita Krueger
8540a6b017
Adding documentation for new Cassandra v3 support
2017-12-12 20:51:22 +00:00
Daniel Wallace
2cc8c5541e
fix pylint
2017-12-12 13:50:21 -07:00
Daniel Wallace
fb7507141a
update return info
2017-12-12 13:48:59 -07:00
Nicole Thomas
7572982419
Merge pull request #44943 from mvivaldi/filters-doc
...
Fix for the jinja documentation
2017-12-12 15:20:40 -05:00
Nicole Thomas
98755b9460
Merge pull request #44940 from bodhi-space/infra6108
...
INFRA-6108 - boto_elb.present() errors if test=True and ELB doesn't exist
2017-12-12 15:04:54 -05:00
Daniel Wallace
1e51d08d91
remove extra config
2017-12-12 12:50:53 -07:00
Daniel Wallace
f29de36cf8
add test
2017-12-12 12:47:31 -07:00
Daniel Wallace
a7df9c3da3
fix py3 tests
2017-12-12 12:47:31 -07:00
Daniel Wallace
8689b531e4
add boto route53 test, error catch and docs
2017-12-12 12:47:31 -07:00
Daniel Wallace
28dac7d7e4
fix typos
2017-12-12 12:47:31 -07:00
Mike Place
c21eab2d68
Add health check support to Route53
2017-12-12 12:47:31 -07:00
Nicole Thomas
353bb95720
Merge pull request #44874 from mcalmer/fix-suse-logdir-permissions
...
older logrotate need su directive
2017-12-12 14:31:24 -05:00
Nicole Thomas
465cacad83
Merge pull request #44832 from damon-atkins/2017.7_replace_with_newer_2016.11_win_pkg
...
win_pkg: Merge full copy of 2016.11 with many fixes and improvements to 2017.7
2017-12-12 13:30:05 -05:00
Nicole Thomas
a32c6865f8
Merge pull request #44933 from rallytime/merge-oxygen
...
[oxygen] Merge forward from 2017.7 to oxygen
2017-12-12 13:23:58 -05:00
Daniel Wallace
66bb755751
add test for effective acls
2017-12-12 09:58:08 -07:00
Daniel Wallace
0ff52a93dd
use last entry in acl
...
This will allow for `effective` permissions to be looked at when the package
manager updates the system.
```
$ getfacl httpd/
user::rwx
group::---
group:webmaster:r-x #effective:---
mask::---
other::---
```
Fixes #44932
2017-12-12 09:54:06 -07:00
Gareth J. Greenaway
95a7744898
Ensuring the values for run_explicit are always ints
2017-12-12 08:37:38 -08:00
Gareth J. Greenaway
ef598b3cec
Adding the ability for skip_during_range to work globally.
2017-12-12 08:37:38 -08:00
Gareth J. Greenaway
c418b14f49
Adjusting now times for scheduler tests.
2017-12-12 08:37:38 -08:00
Gareth J. Greenaway
98457bca2f
Adding a couple simple log messages to see why Jenkins tests are failing
2017-12-12 08:37:38 -08:00
Gareth J. Greenaway
9797922c8b
Moving scheduler tests into a new location. Adding new TEST_SUITE to runtests.py. Add CLI flag to runtests.py so the scheduler tests can be run invidually.
2017-12-12 08:37:38 -08:00
Gareth J. Greenaway
2a2d54605f
Fixing lint
2017-12-12 08:37:38 -08:00
Gareth J. Greenaway
eec7393b0c
Updating various docstrings
2017-12-12 08:37:38 -08:00
Gareth J. Greenaway
77c89afbb8
Removing some debugging/testing statements. Adding a line when checking for parameters, if we've already set run = True further up in the run_explicit then we need to make sure we're still able to run the job even if the evalated is in the past. Additionally some initial integration tests for the new postphone & skip functionality.
2017-12-12 08:37:38 -08:00
Gareth J. Greenaway
3a6403a81f
Initial addition of integration tests for scheduler.
2017-12-12 08:37:37 -08:00
mvivaldi
d23ac4eabc
Fix for the jinja documentation
2017-12-12 17:35:46 +01:00
rallytime
d1317c44e2
Update README with SaltConf18 info
...
Previously we had information for SaltConf16, which is out of date.
2017-12-12 11:32:34 -05:00
rallytime
0a2f47a850
Fix merge conflict resolution error: test_napalm_network
...
There were merge conflicts in this file during the merge forward, which
I resolved incorrectly. This brings the test module into the proper state.
2017-12-12 09:49:18 -05:00
rallytime
725adfa7db
Lint fixes
2017-12-12 09:34:47 -05:00
Nicole Thomas
a811a92b17
Merge pull request #44754 from twangboy/win_fix_inet_pton
...
Fix inet_pton for Windows on Py3
2017-12-12 09:04:19 -05:00
Nicole Thomas
d1e3d6f2c6
Merge pull request #44896 from toanju/document-color-theme
...
document color_theme
2017-12-12 08:52:29 -05:00
Nicole Thomas
53b34e24cd
Merge pull request #44931 from pkruk/fix-missing-parenthis
...
add missing parenthis to keep integration with python3
2017-12-12 08:49:38 -05:00
Tobias Jungel
de227769d6
document color_theme
...
this adds some documentation for the the color_theme added in #3511
2017-12-12 10:03:23 +01:00
Piotr
b1ed739b44
Merge branch '2017.7' into fix-missing-parenthis
2017-12-12 09:57:05 +01:00
Tom Williams
ff64aafc1c
Merge branch 'develop' into infra6108
2017-12-12 03:49:48 -05:00
rallytime
db5866d097
Update old utils paths to new utils paths
2017-12-11 18:43:33 -05:00
rallytime
08c71f13e4
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- doc/ref/configuration/minion.rst
- doc/topics/thorium/index.rst
- salt/beacons/__init__.py
- salt/client/mixins.py
- salt/client/ssh/wrapper/state.py
- salt/daemons/masterapi.py
- salt/grains/extra.py
- salt/minion.py
- salt/modules/cron.py
- salt/modules/file.py
- salt/modules/mac_user.py
- salt/modules/napalm_network.py
- salt/modules/state.py
- salt/modules/win_file.py
- salt/modules/win_pkg.py
- salt/proxy/dummy.py
- salt/state.py
- salt/states/file.py
- salt/states/lxc.py
- salt/utils/__init__.py
- salt/utils/schedule.py
- tests/integration/modules/test_file.py
- tests/integration/modules/test_groupadd.py
- tests/integration/ssh/test_state.py
- tests/integration/states/test_file.py
- tests/unit/daemons/test_masterapi.py
- tests/unit/grains/test_core.py
- tests/unit/modules/test_disk.py
- tests/unit/modules/test_napalm_network.py
- tests/unit/modules/test_state.py
- tests/unit/test_minion.py
- tests/unit/utils/test_process.py
2017-12-11 18:24:41 -05:00
