Mike Place
b69a46b9ad
Merge pull request #20262 from cachedout/tornado_error
...
If tornado is not installed, raise error that will be seen
2015-01-30 11:05:59 -07:00
Mike Place
8162411ddf
Also error and exit cleanly if saltnado can't be loaded
2015-01-30 11:02:03 -07:00
Johannes Ebke
6a13a44498
Make AssociatePublicIpAddress work to fix #19288
2015-01-30 19:00:38 +01:00
Mike Place
7cbf3d7a0d
If tornado is not installed, raise error that will be seen
2015-01-30 10:54:18 -07:00
Thomas S Hatch
aa791d4ac2
Merge pull request #20257 from makinacorpus/arghotfix
...
Only softfail with a state kwarg mismatch
2015-01-30 10:53:35 -07:00
Mathieu Le Marec - Pasquet
81212b436f
state kw mismatch: increase to critical loglevel
2015-01-30 18:51:20 +01:00
Thomas S Hatch
f4b1688ad8
Merge pull request #20253 from rbjorklin/fix_docker_pulled_double_tag
...
Fixed problem with tags occuring twice with docker.pulled
2015-01-30 10:40:04 -07:00
Thomas S Hatch
dc8aecc4d3
Merge pull request #20252 from jayeshka/incron-unit-test
...
adding incron unit test case
2015-01-30 10:38:27 -07:00
Thomas S Hatch
7f72eb9fb8
Merge pull request #20251 from jayeshka/ilo-unit-test
...
adding ilo unit test case
2015-01-30 10:38:09 -07:00
Thomas S Hatch
487394ac30
Merge pull request #20249 from rupeshta/logadm_unit_tests
...
implemented unit test cases for logadm module
2015-01-30 10:37:41 -07:00
Thomas S Hatch
b407b62a38
Merge pull request #20248 from rupeshta/localemod_unit_tests
...
implemented unit test cases for localemod module
2015-01-30 10:37:28 -07:00
Thomas S Hatch
dc09c54702
Merge pull request #20247 from rupeshta/launchctl_unit_tests
...
implemented unit test cases for launchctl module
2015-01-30 10:37:18 -07:00
Thomas S Hatch
267d16505f
Merge pull request #20230 from rallytime/merge_forward_develop
...
Merge 2015.2 into develop
2015-01-30 10:33:59 -07:00
Thomas S Hatch
f494de935c
Merge pull request #20216 from steverweber/return_docs
...
fix returning docs when some minions did not return
2015-01-30 10:31:45 -07:00
Thomas S Hatch
77198d4a53
Merge pull request #20222 from jacksontj/develop
...
More specific error message.
2015-01-30 10:29:39 -07:00
Thomas S Hatch
2b2d98d301
Merge pull request #20236 from joejulian/develop
...
Issue #20235 : blockdev.format fails when succeeding
2015-01-30 10:17:01 -07:00
Thomas S Hatch
9bbc256f5f
Merge pull request #20175 from makinacorpus/c
...
runner: Force mminion loading not to clutter output
2015-01-30 10:05:37 -07:00
Mathieu Le Marec - Pasquet
f35869a99b
Only softfail with a state kwarg mismatch
...
This rels & fix #20227 .
2015-01-30 16:50:38 +01:00
Robin Björklin
7497d714e7
Fixed problem with tags occuring twice with docker.pulled
2015-01-30 14:12:52 +01:00
Jayesh Kariya
378d9656d9
adding incron unit test case
2015-01-30 18:38:56 +05:30
Jayesh Kariya
9a48449d01
adding ilo unit test case
2015-01-30 18:36:58 +05:30
Rupesh Tare
24536cca64
implemented unit test cases for logadm module
2015-01-30 18:28:17 +05:30
Rupesh Tare
3e2b08ca4f
implemented unit test cases for localemod module
2015-01-30 18:22:27 +05:30
Rupesh Tare
2c07dbedb9
implemented unit test cases for launchctl module
2015-01-30 18:17:03 +05:30
Joe Julian
d83bf53555
Issue #20235 : blockdev.format fails when succeeding
...
After a mkfs is issued, an immediate lsblk will show the device as
unformatted. Issuing a sync before lsblk will allow the check to
succeed.
2015-01-29 20:16:40 -08:00
Mike Place
2988b0d13f
Merge pull request #20232 from jacksontj/saltnado
...
Remove unecessary finish() calls
2015-01-29 19:34:53 -07:00
Thomas Jackson
641c76edb4
Remove unecessary finish() calls
...
finish() only needs to be called after functions with @asynchronous decorators, coroutines don't count
2015-01-29 17:58:30 -08:00
rallytime
9898fcf613
Merge branch '2015.2' into 'develop'
...
Conflicts:
.gitignore
.pylintrc
.testing.pylintrc
salt/client/mixins.py
salt/cloud/clouds/msazure.py
salt/config.py
salt/modules/mount.py
salt/runners/doc.py
salt/utils/event.py
salt/utils/reactor.py
2015-01-29 17:24:04 -07:00
Nicole Thomas
34e0cab774
Merge pull request #20228 from rallytime/pylinting
...
Pylint fix for 2015.2
2015-01-29 16:37:10 -07:00
rallytime
cabf5ffd5d
Pylint fix for 2015.2
2015-01-29 16:36:27 -07:00
Thomas Jackson
a4e35de8a8
More specific error message.
...
The old message was misleading because if the file was missing it said "permissions error", when in fact its *any* IOError
2015-01-29 14:34:15 -08:00
Nicole Thomas
6e8e3917b3
Merge pull request #20219 from rallytime/backport_19829
...
Backport #19829 to 2015.2
2015-01-29 15:24:56 -07:00
Nicole Thomas
1632553c23
Merge pull request #20215 from rallytime/bp-19566
...
Backport #19566 to 2015.2
2015-01-29 15:24:16 -07:00
Nicole Thomas
cfaba40f4b
Merge pull request #20214 from rallytime/merge_forward_fifteen_second_try
...
Merge forward fifteen second try
2015-01-29 15:09:53 -07:00
Mike Place
fcec870e36
Merge pull request #20213 from cachedout/expected_args
...
Add username/password to expected args
2015-01-29 14:47:36 -07:00
Nicole Thomas
738a7c8c44
Merge pull request #20209 from rallytime/bp-20166
...
Backport #20166 to 2015.2
2015-01-29 14:29:02 -07:00
Alexander Haase
203b700032
Another pass over modules/mount.py against pylint....
2015-01-29 14:13:19 -07:00
Alexander Haase
5c5d123bc8
Another pass over modules/mount.py against pylint....
2015-01-29 14:13:14 -07:00
Alexander Haase
f3eba17d43
More pylint fixes for changes to modules/mount.py
2015-01-29 14:13:07 -07:00
Alexander Haase
da75fa8ce0
PEP style compliance for changes to states/mount.py
2015-01-29 14:13:02 -07:00
Alexander Haase
61a0421adc
PEP style compliance for changes to modules/mount.py
2015-01-29 14:12:41 -07:00
Alexander Haase
ba1dcb972b
Updating modules/mount.py (mount.fstab) to produce an array for opts, rather than the opts string literal. Allows mount to pass unit tests
2015-01-29 14:12:35 -07:00
Alexander Haase
02cc8bb631
Fixed whitespace error, ran unit tests
2015-01-29 14:12:28 -07:00
Alexander Haase
9b1caf6b42
Normalizing white space to four spaces to remedy pylint errors
2015-01-29 14:12:21 -07:00
Alexander Haase
61250467e4
Debugged & moderately tested match_on functionality for modules/mount and states/mount with relation to fstab.
2015-01-29 14:12:14 -07:00
Alexander Haase
3fd2e254f9
Debugged & moderately tested match_on functionality for modules/mount and states/mount with relation to fstab.
2015-01-29 14:12:06 -07:00
Alexander Haase
ec0e4d328d
Adding rework for mount match-on criteria. Implimented core class in mount/modules to represent and match fstab entries. Re-implimented related methods in DRY compliance.
2015-01-29 14:11:48 -07:00
Steve Weber
44ca51e55b
fix returning docs when some minions did not return
...
when using
```salt \* pkg -d```
some minions will not return and you get an ugly error:
```
[root@salt salt]# salt oat-app\* pkg -d
[ERROR ] An un-handled exception was caught by salt's global exception handler:
TypeError: string indices must be integers, not str
Traceback (most recent call last):
File "/usr/bin/salt", line 10, in <module>
salt_main()
File "/usr/lib/python2.6/site-packages/salt/scripts.py", line 343, in salt_main
client.run()
File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 175, in run
self._output_ret(ret, out)
File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 262, in _output_ret
self._print_docs(ret)
File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 303, in _print_docs
if ret[host][fun]:
TypeError: string indices must be integers, not str
Traceback (most recent call last):
File "/usr/bin/salt", line 10, in <module>
salt_main()
File "/usr/lib/python2.6/site-packages/salt/scripts.py", line 343, in salt_main
client.run()
File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 175, in run
self._output_ret(ret, out)
File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 262, in _output_ret
self._print_docs(ret)
File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 303, in _print_docs
if ret[host][fun]:
TypeError: string indices must be integers, not str
```
the patch is is ugly!!! so please fix correctly.
```
if ret[host] == 'Minion did not return. [Not connected]':
continue
```
thanks
2015-01-29 15:53:33 -05:00
rallytime
9db1a61165
Pylint fix
2015-01-29 13:51:13 -07:00
Flavian
fb2377c076
#19162 added disks to Azure VM creation. Only new empty disks are
...
supported. Add a line
volumes:
- { size: 10 (default 100), lun: [0-15](default: 0), disk_label:
<label>(default: <role-name>-disk-<lun>) }
2015-01-29 13:48:48 -07:00
