Commit Graph

5833 Commits

Author SHA1 Message Date
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
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
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