regilero
f980c64bc4
MySQL Module: remove use_unicode connection attribute, not needed for charset managment and would create new bugs with unicode() strings
2013-12-10 23:07:13 +01:00
Erik Johnson
c0f03a3297
salt.utils.which(): use default_path if binary not found
...
To make salt.utils.which() operate well in salt-call when invoked from
cron (where PATH may be present but limited), try the paths in
default_path if the binary is not found in the search_path.
2013-12-10 16:05:02 -06:00
regilero
532796b4d2
MySQL module integration tests: grants tests and percent and _ tests
2013-12-10 22:54:45 +01:00
regilero
247fc33982
MySQL module: some percent related fixs, mostly
2013-12-10 22:52:19 +01:00
regilero
4608465600
Mysql Module: centralize call to cursor execute for logs and to undo the percent escape if no args
2013-12-10 22:51:01 +01:00
Thomas S Hatch
89e29323ec
Merge pull request #9147 from garethgreenaway/develop
...
Adding missing network functions for debian_ip.py
2013-12-10 12:29:33 -08:00
Gareth J. Greenaway
d4e2cef4e6
Merge remote-tracking branch 'upstream/develop' into develop
2013-12-10 11:56:58 -08:00
Gareth J. Greenaway
ca9197c5a7
Added missing definitions for networking setting, add and get. Changed interface parsing to use a dictionary for inet and inet6 interfaces instead of an array. Certain assumptions were made within the code on the order the ipv4 & ipv6 interfaces would appear, using a dictionary instead resolves some potential issues that could have popped up with an array. removing the tests for ip.get_network_settings and ip.build_network_settings from the exclusion.
2013-12-10 11:46:47 -08:00
Thomas S Hatch
3e23d6f0d1
Whopps! Needs to be an empty dict :)
2013-12-10 12:25:40 -07:00
Thomas S Hatch
0923aed4d3
Merge pull request #9144 from jfrost/external_ip_grain
...
new external_ip grain for salt - requires that requests be installed
2013-12-10 11:30:33 -08:00
Jeff Frost
05277cfd32
move external_ip to separate file
...
return empty dict instead of False if requests fails to import
2013-12-10 11:05:10 -08:00
C. R. Oldham
cdb6002fbe
Merge pull request #9145 from cro/develop
...
Prevent traceback when job is None.
2013-12-10 11:04:44 -08:00
C. R. Oldham
c350a28991
Prevent traceback when job is None.
2013-12-10 12:03:08 -07:00
Thomas S Hatch
f95087ed80
Merge pull request #9142 from terminalmage/quickfix
...
Fix reporting of file.blockreplace state when test=True
2013-12-10 10:57:55 -08:00
Thomas S Hatch
f689521f5d
Merge pull request #9143 from whiteinge/salt-shell
...
Initial stab at a development salt shell
2013-12-10 10:53:30 -08:00
Jeff Frost
22e4cde76a
new external_ip grain for salt - requires that requests be installed
2013-12-10 10:19:34 -08:00
Seth House
69bac1d116
Initial stab at a development salt shell
...
There is quite a bit of additional work that could be done here but this
gets things rolling at least.
Refs #3814
2013-12-10 11:09:50 -07:00
Erik Johnson
4464da4423
Fix reporting of file.blockreplace state when test=True
...
When test=True is used, this state does a dry run and doesn't change the
file (as expected), but reports that changes were made. This commit
fixes the reporting so that it states that changes would have been made.
2013-12-10 11:55:27 -06:00
viq
4628065f2c
Don't send timestamps in UTC
...
Logstash by itself takes care of conversion of timestamps to UTC, with how it was logstash was showing wrong time for the events.
2013-12-10 16:40:55 +01:00
Pedro Algarvio
a54ed65b79
Fix white-space related issues, and anomalous backslash.
2013-12-10 12:59:00 +00:00
Joseph Hall
426a7a8870
Merge pull request #9106 from ranl/windows_deploy_script
...
salt-cloud: ec2 cloud provider fix issue of windows minion deployment
2013-12-10 04:20:00 -08:00
Joseph Hall
2ada43ce70
Merge pull request #9137 from ranl/fix_win_deploy_minion_conf
...
fix windows deploy minion configuration
2013-12-10 04:09:54 -08:00
Pedro Algarvio
163c98fdf4
Make the regex work in Python 2.6
2013-12-10 11:11:06 +00:00
Pedro Algarvio
1341573532
Fix the SSH password regular expression.
2013-12-10 11:08:52 +00:00
Pedro Algarvio
285d825d8d
Fix white-space lint issues
2013-12-10 10:53:24 +00:00
regilero
e6d79e00f9
MySQL Module: fix on grants removal
2013-12-10 11:48:14 +01:00
regilero
70b98e8ddc
MySQL Module: Small fixs and debug on _grant_to_tokens
2013-12-10 11:47:18 +01:00
Pedro Algarvio
e45cbf1dca
Add unit test for the ssh password regex matching
2013-12-10 10:46:25 +00:00
regilero
8edbb63d97
MySQL Lint fixs
2013-12-10 11:45:47 +01:00
ranl
77b2bb2c09
salt-cloud: adding authentication validation to windows host in ec2 cloud provider
2013-12-10 11:57:05 +02:00
ranl
68214b2c50
remove spaces from cloud utils
2013-12-10 11:26:44 +02:00
ranl
d8d6de7e21
salt-cloud: enforce mandatory windows config to windows minions
2013-12-10 11:22:26 +02:00
Pedro Algarvio
8b2beacb28
Merge pull request #9135 from pengyao/memcache
...
Add __virtual__ function for memcache modules
2013-12-10 01:00:30 -08:00
Seth House
2e9985dbea
Merge pull request #9136 from pengyao/grains
...
fixed a typo about reST links
2013-12-10 00:47:59 -08:00
pengyao
444e46c134
fixed a typo about reST links
2013-12-10 15:39:49 +08:00
Dmitry Malinovsky
11bbebdb19
list_pkgs became quiet
2013-12-10 13:46:44 +07:00
Thomas S Hatch
ed79041e9c
Merge pull request #9133 from terminalmage/issue9121
...
Fix bug in pkgrepo when switching to/from mirrorlist-based repo def
2013-12-09 19:57:42 -08:00
Thomas S Hatch
5c74ec4d22
Merge pull request #9131 from terminalmage/fix-filemanaged-regression
...
Fix regression in file.managed
2013-12-09 19:57:20 -08:00
Thomas S Hatch
7d9adc697b
Merge pull request #9132 from cachedout/file-client-tests
...
Starting work on new set of tests for fileclient.
2013-12-09 19:55:02 -08:00
Thomas S Hatch
5379f09a47
Merge pull request #9113 from pengyao/develop
...
Add grains_list state module
2013-12-09 19:54:31 -08:00
pengyao
366c9153a5
merge grains_list state module to grains state module
2013-12-10 10:00:13 +08:00
Erik Johnson
80ed5fab51
Fix bug in pkgrepo when switching to/from mirrorlist-based repo def
...
This adds a check to ensure that both of mirrorlist and baseurl aren't
specified, and also deletes mirrorlist when baseurl is specified (and
vice-versa). Additionally, rather than returning a string containing
errors when they are encountered, raise an exception.
2013-12-09 19:24:28 -06:00
Mike Place
55ecc5d0ab
Starting work on new set of tests for fileclient.
...
Also, more integration testing for templates.
2013-12-09 16:47:49 -07:00
Colton Myers
1e27f5eb3a
Fix typo (option sin -> options in)
2013-12-09 16:38:21 -07:00
Pedro Algarvio
561b97f475
Revert "Migrate the Jenkins script to the new Terminal class."
...
This reverts commit aae6f0c4a1
2013-12-09 23:06:17 +00:00
Pedro Algarvio
686d75889b
Revert "Make it run!"
...
This reverts commit a295af62fd
2013-12-09 23:05:47 +00:00
Pedro Algarvio
363c9b828f
Revert "Try to get the tests suite output streamed."
...
This reverts commit 1ef452a03a
2013-12-09 23:05:17 +00:00
Pedro Algarvio
8ea7390789
Revert "Let's be explicit in passed keyword arguments."
...
This reverts commit 60f759dc68
2013-12-09 23:05:08 +00:00
Pedro Algarvio
3304fe3376
Revert "The minion, needs to be synced first?"
...
This reverts commit 8b12dd743e
2013-12-09 23:04:47 +00:00
Erik Johnson
535e6df64a
Fix regression in file.managed
...
Pull request #8818 caused a couple of regressions. Firstly, it assumes
that, if "mode" is not specified (and thus defaults to None), that you
want the permissions to be equal to those dictated by the umask. This
means that a file with perms 640, which already exists, will be chmod'ed
to 644 if the system umask is 022 and no "mode" parameter was specified
in the state. This is not the expected behavior.
Secondly, the calculated perms are passed to file.check_perms as an
integer whose octal representation is the correct value for the file
permissions (i.e. 0o644, which is == 420 in decimal). However,
file.check_perms is designed to be run from the CLI, and thus requires
a value of 644 (decimal) to be passed, in order to set 644 permissions.
file.check_perms can also accept the mode as a string, so this is how
this commit passes the value to file.check_perms when a new file is
created.
2013-12-09 16:55:53 -06:00
