Commit Graph

5814 Commits

Author SHA1 Message Date
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
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
Thomas S Hatch
7a7a73a27e Merge pull request #1783 from scott-w/develop
Use explicit field name declarations in user_list
2012-08-07 10:12:59 -07:00
Stas SUȘCOV
e7f2a78206 Add an important note on known_hosts for git state. 2012-08-07 14:49:57 +03:00
Stas SUȘCOV
b1991a9fdf Run git submodule with --recursive,.
To make sure nested submodules are synced too.
2012-08-07 14:49:33 +03:00
Scott Walton
0a4e45f5ca Explicitly query fieldnames to make user_list() compatible on postgres versions between 6.3 and 9.1 #1766 2012-08-07 10:20:12 +01:00
Thomas S Hatch
d9c086fac9 Merge pull request #1782 from mrud/mru/upstart
Mru/upstart
2012-08-06 22:32:50 -07:00
Ulrich Dangel
f7de4b74f4 Simplify upstart definitions
* Remove unecessary script stanzas
* Remove explicit interpreter
* Run salt-master in the foreground
2012-08-07 06:39:06 +02:00
Ulrich Dangel
218a0bd35d Change upstart definition to respawn minions as well as syndic and limit master respawning. 2012-08-07 06:37:58 +02:00
Thomas S Hatch
549e3bf651 Merge pull request #1779 from s0undt3ch/no-more-os.sep.join
Stop using `os.sep.join` to join paths.
2012-08-06 16:50:40 -07:00
Pedro Algarvio
8fba9a2b47 Stop using os.sep.join to join paths.
Python has a specific function to join paths for a reason. Let's see some examples why:
```python
>>> import os
>>> p1 = '/'
>>> p2 = 'foo'
>>> os.path.join(p1, p2)
'/foo'
>>> os.sep.join([p1, p2])
'//foo'
>>> p2 = '/foo'
>>> os.sep.join([p1, p2])
'///foo'
>>> os.path.normpath(os.sep.join([p1, p2]))
'/foo'
>>> p2 = 'foo'
>>> os.path.normpath(os.sep.join([p1, p2]))
'//foo'
>>> p2 = '/foo'
>>> os.path.join(p1, p2)
'/foo'
>>>
```

Also, python docs also state the knowing the OS separator is not always enough to parse/join paths, see http://docs.python.org/library/os#os.sep

There are some posts on the internet which state that `os.sep.join` is faster that `os.path.join`, and, most likely it is, but is it THAT faster? Does that really make a difference in salt's context, specially since it's error prone as shown above?
2012-08-07 00:24:42 +01:00
Pedro Algarvio
0b73795310 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-08-06 23:05:37 +01:00
Thomas S Hatch
654fbfe065 Merge pull request #1778 from scott-w/develop
Develop
2012-08-06 14:11:32 -07:00
Pedro Algarvio
2a7e9500d7 Set the master's logfile to avoid travis failing. 2012-08-06 17:58:30 +01:00
Thomas S Hatch
3f489d4622 Merge pull request #1774 from bretep/feature/network_state-bridge-bypassfirewall
Normalize quoting
2012-08-06 08:49:49 -07:00
Bret Palsson
dd366699df Normalize quoting 2012-08-06 09:44:34 -06:00
Thomas S Hatch
2128567276 Merge pull request #1773 from paulcollinsiii/pip_logging
Fix log option in pip module
2012-08-06 01:10:13 -07:00
Thomas S Hatch
4cfc711550 Merge pull request #1771 from s0undt3ch/dotted-loaded-module-names
Improved the salt loader names for log filtering.
2012-08-06 01:05:50 -07:00
Thomas S Hatch
2355dc3dd4 Merge pull request #1770 from s0undt3ch/master
Make file.touch work on directories and fix some tests when using `--no-clean`
2012-08-06 01:03:49 -07:00
Thomas S Hatch
0d195949d6 Merge pull request #1768 from s0undt3ch/cleanup-parsers
Parsers(master, minion, syndic) cleanup code.
2012-08-06 00:58:49 -07:00
Paul Collins
f1965e2c01 Fix log option in pip module 2012-08-05 19:52:35 -07:00
Thomas S Hatch
bda1dec33a Fix log message in py renderer 2012-08-05 20:00:04 -06:00
Scott Walton
d7bd6589e7 Removed TODO after reading source 2012-08-05 22:17:54 +01:00
Pedro Algarvio
b8135aa801 Fix bug when calling salt-call --doc without args. Should output all documentation. 2012-08-05 19:51:48 +01:00
Pedro Algarvio
c89928ec33 Typo. 2012-08-05 19:31:13 +01:00
Pedro Algarvio
a4b96eacfc Corrected last commit line placement. 2012-08-05 19:29:56 +01:00
Pedro Algarvio
dcc0efcd70 Re-add wrongly removed line. 2012-08-05 19:27:28 +01:00
Pedro Algarvio
d01b8da9aa Fix some tests when using --no-clean
When using `--no-clean` while running tests, some files/dirs still need to be removed, if not, test will fail. This commit tries to addresses those issues.
2012-08-05 19:23:12 +01:00
Pedro Algarvio
59add96a95 Include a missing .format() call to a message. 2012-08-05 18:53:25 +01:00
Pedro Algarvio
6b1bfb6eb7 Make file.touch also work with directories.
Instead of relying that what we're touching is a file, first check if the provided path exists, if not, create a file, else, just update times.
2012-08-05 18:50:11 +01:00
Pedro Algarvio
3f1aa40877 Improved the salt loader names for log filtering.
Now, when running the salt loader, we get dotted names for the loaded modules, states, etc.
Instead of, for example `foo_module`, `bar_state`, we now get `salt.loaded.module.foo` and `salt.loaded.state.bar`, etc.
This will greatly help using the granular log filtering.
2012-08-05 18:41:43 +01:00
Thomas S Hatch
896a816119 Merge pull request #1769 from amuraru/develop
Fixed sync and reload of custom modules bundled in packages
2012-08-04 19:56:03 -07:00
Adrian Muraru
4b18e4ca41 Fixed sync and reload of custom modules bundled in packages 2012-08-05 02:01:55 +03:00
Pedro Algarvio
9d1a252136 Fix some left over code. 2012-08-04 23:46:28 +01:00
Thomas S Hatch
12010e054f Clean up conflicing pillar data in the docs 2012-08-04 16:42:21 -06:00
Scott Walton
a724427e73 Fixed coding error #1766 2012-08-04 23:26:05 +01:00
Pedro Algarvio
ac1ee79fa6 Cleanup the salt-run(salt.cli.SaltRun) binary parser.
Reused the timeout mix-in. All cli tools parsers also reuse the config mixin.
This commit finishes cleaning up the cli tool parsers.
2012-08-04 23:25:37 +01:00
Pedro Algarvio
261450e90f Cleanup the salt-call(salt.cli.SaltCall) binary parser.
Reused the logging and output mix-ins.
2012-08-04 23:07:39 +01:00
Pedro Algarvio
060f33a15a Cleanup the salt-key(salt.cli.SaltKey) binary parser.
Reused the output options and logging setup mix-ins.

Fixed a bug introduced in previous commit on `salt.utils.parsers.SaltCPOptionParser._mixin_after_parsed()`, function does not accept any arguments.
2012-08-04 22:55:15 +01:00
Pedro Algarvio
f5aad4f8e2 Cleanup the salt-cp(salt.cli.SaltCP) binary parser.
For this, the timeout mix-in and both the target and output parser group mix-ins were re-used. Way less code and logic to keep track of.
Added a simple test for this binary too.
2012-08-04 22:28:51 +01:00
Scott Walton
865414bf28 Modified user_exists to query the database; partial fix for #1766 2012-08-04 22:16:34 +01:00
Pedro Algarvio
b582e40ff1 Cleanup the salt(salt.cli.SaltCMD) binary parser.
* Created 2 mix-ins as option groups, the output options and the target options. This will allow adding some explanatory text besides separating these options from the parser's main options.
* All options on the parser, including the grouped options are now merged to the loaded configuration which will latter get passed on.
* Also created the timeout mix-in which will be used in other binaries.
2012-08-04 22:08:06 +01:00
Pedro Algarvio
503f4bdf08 Remove extra kwargs to setup_config. 2012-08-04 20:31:59 +01:00
Pedro Algarvio
d776705e49 Parsers(master, minion, syndic) cleanup code.
Moved the minion, master and syndic parsers to use mixins to clean up, reuse, and automate some of the required procedures.
2012-08-04 19:58:32 +01:00
Thomas S Hatch
19a93709b1 Add soem checks to compile_highstate 2012-08-04 10:52:15 -06:00