Alex Austin
d74057224d
Un-normalize os_family in pkgrepo state
...
The __grains__['os'].lower() code was added in
e7fb3095ce
2018-05-02 20:32:54 -05:00
Erik Johnson
a1e9fe00fd
Skip trying to render a template for a nonexistant SLS file
...
This skips an unnecssary call to compile_template, and also prevents a
confusing error message: "Template was specified incorrectly: False",
for cases when an SLS target specified in a top file does not exist.
2018-05-02 20:28:45 -05:00
Nicole Thomas
ed69821d19
Merge pull request #47433 from s0undt3ch/2017.7
...
Add missing requirements files not commited in #47106
2018-05-02 16:57:13 -04:00
twangboy
14ee5537b9
Add @with_tempdir helper
...
Fix two state tests
Remove redundent tests
2018-05-02 12:17:36 -06:00
Pedro Algarvio
5abadf25d6
Add missing requirements files not commited in #47106
2018-05-02 18:34:09 +01:00
lomeroe
4902f1e2ba
check if a policy has either an enabled value or enabled list entry or
...
a disabled value or disabled list entry when determining the state of
the policy
Some policies have one but not the other (in which case different
entries in the registry.pol file are added for 'Enabled' or 'Disabled').
A partial fix for this was
previously added, but did not check for all possible types when trying
to determine if the policy is enabled/disabled and also did not perform
the same check in the enabled/disabled list checks.
This would result in some policies being reported by the module as
Enabled even though they were disabled (for example "Windows
Components\Internet Explorer\Make proxy settings per-machine (rather
than per-user)" if set to 'Disabled' would report 'Enabled')
2018-05-02 11:43:51 -05:00
Nicole Thomas
7ae3497b0c
Merge pull request #47429 from gtmanfred/2017.7
...
server_list_min should use state, not status
2018-05-02 12:27:55 -04:00
Mike Place
2f5fc4ecc5
Merge pull request #47399 from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2
...
zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes
2018-05-02 10:11:15 -05:00
Daniel Wallace
8ae32033cc
server_list_min should use state, not status
...
This is what is used when getting server names quickly.
2018-05-02 08:45:55 -05:00
Nicole Thomas
b14e974b5f
Merge pull request #47343 from Ch3LL/win_srv_test
...
Add additional service module integration tests and enable for windows
2018-05-02 09:39:45 -04:00
twangboy
6c3b5fa6fa
Fix typo
2018-05-01 16:28:48 -06:00
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024
2018-05-01 16:26:04 -06:00
twangboy
7c46d9d0d4
Fix integration.modules.test_pip
...
Pass password as kwarg for runas on Windows
Fix issues with pip 10 in unit.states.test_pip
2018-05-01 15:33:29 -06:00
Nicole Thomas
b0f3fb577f
Merge pull request #47375 from terminalmage/issue47310
...
Warn on use of virtual packages in pkg.installed state
2018-05-01 17:12:18 -04:00
Nicole Thomas
56235032f4
Merge pull request #47415 from kstreee/fix-local-client-tgt-bug
...
Fixes a bug of rest_tornado's 'local' client, complement fix of #46326
2018-05-01 17:11:24 -04:00
Nicole Thomas
d65ceaee03
Merge pull request #47286 from baniobloom/vpc_peering_connection_name_fix
...
fixed vpc_peering_connection_name option
2018-05-01 15:02:09 -04:00
kstreee@gmail.com
b8d37e0a1e
To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is #46692 .
2018-05-02 03:21:06 +09:00
Erik Johnson
fa2bea52bb
Remove extra blank line to appease linter
2018-05-01 13:11:19 -05:00
Erik Johnson
f8ab2be81c
Add debug logging if we fail to detect virtual packages
2018-05-01 13:11:19 -05:00
Erik Johnson
67c4fc56ac
Warn on use of virtual packages in pkg.installed state
2018-05-01 13:11:19 -05:00
kstreee
4627bad1fd
Realizes 'tgt' field into actual minions using ckminions to subscribe results of the minions before publishing a payload.
2018-05-02 02:20:56 +09:00
Ch3LL
1a7ffb4e0d
return error if diskusage not available
2018-05-01 13:11:23 -04:00
Mike Place
a968965087
Merge branch '2017.7' into vpc_peering_connection_name_fix
2018-05-01 11:31:08 -05:00
Ch3LL
2173b6f549
ensure we are enabling/disabling before test
2018-05-01 11:53:55 -04:00
twangboy
2600e404d5
Fix overly long line
2018-04-30 15:45:09 -06:00
twangboy
5c8db05769
Fix issue where the cwd was being removed
2018-04-30 15:36:44 -06:00
Daniel Wallace
a36e49fd27
fix pylint
2018-04-30 14:15:53 -05:00
Ch3LL
10bd63a976
Skip status.diskusage integration tests on macsox
2018-04-30 14:44:34 -04:00
Nicole Thomas
8a5d4437bb
Merge pull request #47270 from meaksh/2017.7-fix-retcode-on-schedule-utils
...
Fix minion scheduler to return 'retcode' from executed functions
2018-04-30 14:21:54 -04:00
Nicole Thomas
5b51075384
Merge pull request #47371 from rallytime/fix-47264
...
Fix "of pass" typo in grains.delval docs: change to "or pass"
2018-04-30 14:18:45 -04:00
Bo Maryniuk
98b5629b36
Fix imports
2018-04-30 16:08:53 +02:00
Bo Maryniuk
d94c0f0152
Remove unnecessary variable
2018-04-30 16:06:05 +02:00
Bo Maryniuk
8e377b5653
Lintfix: E0203 and attribute access
2018-04-30 16:06:05 +02:00
Bo Maryniuk
2aab70b1b8
Install ZMQ handler if <15 version
2018-04-30 16:06:05 +02:00
Bo Maryniuk
296c589f4b
Use ZMQ switch utility in the integration tests
2018-04-30 16:06:05 +02:00
Bo Maryniuk
ab5fa34d7c
Use ZMQ_VERSION_INFO constant everywhere
2018-04-30 16:06:05 +02:00
Bo Maryniuk
43b5558b82
Add trace logging on ZMQ sockets communication
2018-04-30 16:06:05 +02:00
Bo Maryniuk
164204a9fe
Remove duplicate code for ZMQ monitor handling
2018-04-30 16:06:05 +02:00
Bo Maryniuk
834b1e4ff0
Remove obsolete ZMQIOLoop direct instance
2018-04-30 16:06:05 +02:00
Bo Maryniuk
1c90cbdb3c
Remove an empty line
2018-04-30 16:04:37 +02:00
Bo Maryniuk
ef2e0acd66
Add logging on ZMQ socket exception
2018-04-30 16:04:37 +02:00
Bo Maryniuk
38ceed371d
Lintfix: ident
2018-04-30 16:04:37 +02:00
Bo Maryniuk
1ece6a5f52
Lintfix: line too long
2018-04-30 16:04:37 +02:00
Bo Maryniuk
4e650c0b44
Remove code duplicate by reusing utilities functions
2018-04-30 16:04:37 +02:00
Bo Maryniuk
57da54b676
Fix imports
2018-04-30 16:01:06 +02:00
Bo Maryniuk
948368e9a1
Add libzmq version info builder
2018-04-30 16:01:06 +02:00
Bo Maryniuk
0b4a17b859
Update log exception message
2018-04-30 16:01:06 +02:00
Bo Maryniuk
116e1809fc
Put a message alongside the exception to the logs
2018-04-30 16:01:06 +02:00
Bo Maryniuk
4bc43124b7
Remove unnecessary ZMQ import and check for its presence
2018-04-30 16:01:06 +02:00
Bo Maryniuk
05f4d40269
Use utility for ZMQ import handling in SSH client
2018-04-30 16:01:06 +02:00
