Commit Graph

5908 Commits

Author SHA1 Message Date
Thomas S Hatch
3d70fc1190 Merge pull request #1814 from s0undt3ch/develop
Fix `salt-call` bug with default outputter.
2012-08-13 08:01:19 -07:00
Pedro Algarvio
e32faa4a28 Fix salt-call bug with default outputter.
* `salt-call` default outputter returned from `salt.output.get_printout()` was `None` and `None` isn't callable neither outputs anything useful. In this case, the fault Outputter  should be used.
* `get_printout()` also tested for `txt_out` which now is, in the cleaned up parsers, `text_out`. Fixed.
2012-08-13 07:10:42 +01:00
Thomas S Hatch
3957df6401 Merge pull request #1812 from s0undt3ch/issues-1756
There's no logging NullHandler in `2.6`. Fix it.
2012-08-11 13:05:59 -07:00
Pedro Algarvio
c5f1236984 There's no logging NullHandler in 2.6. Fix it. 2012-08-11 21:03:49 +01:00
Thomas S Hatch
5172f575a3 Merge pull request #1811 from s0undt3ch/issues-1756
Final fix for saltstack/salt#1756
2012-08-10 17:31:58 -07:00
Pedro Algarvio
9dfce0f7d2 Final fix for saltstack/salt#1756
Don't try to import `salt.log` during tests. Adapt `check_user` test accordingly.
2012-08-11 01:28:49 +01:00
Thomas S Hatch
0979e43dbf Merge pull request #1806 from s0undt3ch/issues-1804
Proposed fix for saltstack/salt#1804
2012-08-10 17:15:00 -07:00
Pedro Algarvio
1bc1401448 Complete fix saltstack/salt#1806
Turn the exit error into a warning. Added a logging message telling us what configuration file, if any, was loaded.
2012-08-11 00:57:33 +01:00
Thomas S Hatch
223e683220 Merge pull request #1810 from s0undt3ch/issues-1756
Some more fixes regarding saltstack/salt#1756
2012-08-10 16:48:07 -07:00
Pedro Algarvio
80804c67b4 Some more fixes regarding saltstack/salt#1756
Setup and disable logging during the tests.
2012-08-11 00:44:16 +01:00
Pedro Algarvio
1cae292c68 Fix tests/unit/utils/verify_test.py since verify_user no longer accepts the log argument. 2012-08-11 00:30:13 +01:00
Thomas S Hatch
4293225e7f Merge pull request #1808 from s0undt3ch/issues-1756
Proposed fix for saltstack/salt#1756
2012-08-10 11:14:17 -07:00
Thomas S Hatch
30c8062e95 Merge pull request #1805 from s0undt3ch/issues-1789
Proposed fix for saltstack/salt#1789
2012-08-10 11:12:40 -07:00
Pedro Algarvio
4be8015e64 Fix saltstack/salt#1756
* Only use logging if the console logging has been properly setup, in case it hasn't been, write the message to `sys.stderr`.
* Removed the log argument passed to `salt.verify.check_user`, it's not needed anymore.
2012-08-10 11:23:54 +01:00
Pedro Algarvio
304b89fe38 Fix saltstack/salt#1804
Exit if the configuration directory does not exist. This is because the initial parser relies on loading a configuration file, and, if not found, default values are used which won't lead the user to the initial problem, the configuration directory does not exist or is not the correct one.
2012-08-10 10:15:44 +01:00
Pedro Algarvio
de8eb5a243 Fix salstack/salt#1789
Exit `verify_env` processing upon first `OSError`. Use the same error number.
2012-08-10 09:53:59 +01:00
Pedro Algarvio
d97a8c935d Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-08-10 09:20:47 +01:00
Thomas S Hatch
57098a93b2 Merge pull request #1801 from s0undt3ch/parsers-cleanup-leftovers
Some more parsers cleanup and fixes.
2012-08-09 22:45:12 -07:00
Thomas S Hatch
2629aea817 Merge pull request #1798 from kjkuan/develop
Fixed a problem of file.recurse not working in solo mode(file_client=='l...
2012-08-09 22:40:01 -07:00
Thomas S Hatch
f552de21a1 Merge pull request #1802 from alekibango/develop
added bash completion script
2012-08-09 22:16:56 -07:00
David Pravec
b6d7107f01 added bash completion script
Some commands and options are still missing completion,
but most do work well, including modules, functions,
grains and grain item values, nodegroups, salt-key operations, ...

This file should be installed into
     /etc/bash_completion.d/salt

I am not sure where and how to do that,
so i leave this open for others to solve.
2012-08-10 01:59:01 +02:00
Pedro Algarvio
c6d7c19b65 Make sure the configuration directory path is absolute. 2012-08-09 23:59:08 +01:00
Pedro Algarvio
fb0a03d077 Some more parsers cleanup and fixes. 2012-08-09 23:01:23 +01:00
Pedro Algarvio
ca127829ad Make sure the configuration directory path is absolute. 2012-08-09 20:45:12 +01:00
Pedro Algarvio
5648282da1 Fix merging cli options.
When a setting is not on the configuration file, add it to the runtime config, even if it's the default value.
2012-08-09 19:30:51 +01:00
Jack Kuan
919a1ea5de Fixed a problem of file.recurse not working in solo mode(file_client=='local').
In solo mode, files are copied directly from below one of the file_roots instead
of from below the cache_dir. Therefore, when computing the relative path of the file
below the destination directory, different starting point needs to be used.
2012-08-09 11:01:13 -04:00
Thomas S Hatch
33d28a6c21 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-08-09 00:12:23 -06:00
Thomas S Hatch
519b014352 Disable amazon from generic service module 2012-08-09 00:11:02 -06:00
Thomas S Hatch
38bbe2e5f9 Add amazon to rh_service module 2012-08-09 00:10:19 -06:00
Thomas S Hatch
48ca758fac Merge pull request #1788 from bastichelaar/mongodb
Mongodb module and state
2012-08-08 19:32:21 -07:00
Thomas S Hatch
ecfe7704c8 Merge pull request #1796 from fatbox/returner-success
Indicate success to the returner functions
2012-08-08 19:29:35 -07:00
Thomas S Hatch
2299cd1011 Merge pull request #1795 from fatbox/mysql-grant-fixes
Fix mysql module from breaking a highstate run due to mistake in grant
2012-08-08 19:28:08 -07:00
Evan Borgstrom
f65a18ab81 Merge branch 'returners-functions' into returner-success 2012-08-08 17:42:39 -04:00
Evan Borgstrom
05f5000c46 Indicate success to returner modules [GH-1792] 2012-08-08 17:27:06 -04:00
Evan Borgstrom
aa205d348d Fix mysql module from breaking a highstate run due to mistake in grant
I had `host: 'loalhost'` (notice the misspelling) set for the grant but
the correct `host: 'localhost'` set for the user & database and when
applying highstate it would bail out with:

```
[INFO    ] Executing state mysql_user.present for gladca_prod
[INFO    ] User 'gladca_prod'@'localhost' has been created
[INFO    ] {'gladca_prod': 'Present'}
[INFO    ] Executing state mysql_grants.present for gladca_prod
[INFO    ] User 'gladca_prod'@'loalhost' does not exist
Error running 'state.highstate': argument of type 'bool' is not iterable
```
2012-08-08 17:15:29 -04:00
Thomas S Hatch
24a50f8799 Merge pull request #1793 from s0undt3ch/path-join
Multi-platform path joiner(appender)
2012-08-08 08:58:24 -07:00
Thomas S Hatch
db61a42fc1 Merge pull request #1791 from s0undt3ch/develop
salt-key revert `--key-logfile` deprecation + Travis-CI related fixes
2012-08-08 08:55:33 -07:00
Pedro Algarvio
639471d110 Multi-platform path joiner(appender)
This commit kind of reverts the previous "no more os.sep.join ..." commit by solving the issue which led to switching that code to `os.path.join`. Tested both on linux and windows.
2012-08-08 14:43:34 +01:00
Pedro Algarvio
2faada54d3 Fix the too many open file descriptor issues on 2.6 while running tests. 2012-08-08 09:04:52 +01:00
Pedro Algarvio
2bf0187ae5 Don't close stderr if it's not being used. 2012-08-08 08:18:45 +01:00
Pedro Algarvio
bbfa0b939b One more try travis. 2012-08-08 01:35:36 +01:00
Pedro Algarvio
12007c23a3 Let's see if travis stops failing on 2.6 with "filedescriptor out of range in select()" 2012-08-08 01:21:16 +01:00
Pedro Algarvio
759d67ffc0 Reverted back the --key-logfile deprecation.
On the parsers cleanup branch, I though about making the available options as equal as possible. Since the log_file setting for the master and the minion could be separately set,  I made the logfile option for the key also log_file. Yet, since there's no key specific config file, it shares master, one could only specify the log_file settings from the cli,   it could not be hardcoded on the config file, unless, we made a separate config file just for key.
So, in order to reduce required changes, and keep it all as backwards compatible as possible, the key log file options is now, once again, `--key-logfile` which will allow us to   hardcode it in the masters config file as `key_logfile`.
This will also, hopefully make travis behave better too.
2012-08-08 01:08:38 +01:00
Bas Tichelaar
c61ec74969 Added initial version of mongodb module and state 2012-08-07 22:19:30 +02:00
Thomas S Hatch
3104549991 Merge pull request #1787 from fatbox/returners-functions
Provide functions to returners via __salt__
2012-08-07 11:36:13 -07:00
Evan Borgstrom
0e0ae6c261 Actually pass the pack to filter_func 2012-08-07 14:29:19 -04:00
Evan Borgstrom
ab81e0441f Add functions to returners as __salt__ 2012-08-07 14:25:20 -04:00
Thomas S Hatch
c425fb0541 Merge pull request #1786 from epoelke/develop
supress console output from key generation
2012-08-07 11:20:10 -07:00
Eric Poelke
14f0e1cf98 supress console output from key generation
Output from M2Crypto.RSA will no longer display when creating keys.
2012-08-07 11:02:31 -07:00
Thomas S Hatch
2a162d7e6e Merge pull request #1785 from stas/develop
Minor improvements for git state.
2012-08-07 10:15:35 -07:00