Commit graph

4630 commits

Author SHA1 Message Date
Michael DeHaan
783a12cc0e Resolve merge commit. 2013-03-25 22:32:01 -04:00
Michael DeHaan
6f2a0c60f7 Merge branch 'ansible_inventory_basedir' of git://github.com/stoned/ansible into test_basedir
Conflicts:
	lib/ansible/runner/__init__.py
2013-03-25 22:30:06 -04:00
Michael DeHaan
28570f922e Merge pull request #2498 from jcftang/devel
Fix reinplace in macports package to work on both 10.7 and 10.8
2013-03-25 19:26:19 -07:00
Michael DeHaan
774bf8abe6 Add state to rhn_channel docs 2013-03-25 22:24:30 -04:00
Michael DeHaan
3c5890f42b Ensure that when transferring a file to a directory the name of the file is the correct basename and not 'source'. 2013-03-25 22:19:35 -04:00
Michael DeHaan
7044e53e07 Allow conditionals on BYPASS_HOST_LOOP plugins like add_host 2013-03-25 21:16:18 -04:00
Jimmy Tang
2dce6089c4 Fix reinplace in macports package to work on both 10.7 and 10.8
reinplace on OSX 10.8 seems to behave differently, this change has been tested
on a few 10.8 and 10.7 machines.
2013-03-25 17:08:40 +00:00
Michael DeHaan
cd0dd2a6ad Merge pull request #2496 from lorin/mycnf-quotes
Strip quotes when parsing my.cnf
2013-03-25 08:15:58 -07:00
Michael DeHaan
fee201428f Fix RHN module YAML docs formatting 2013-03-25 11:03:38 -04:00
Michael DeHaan
861bee3e36 Quoting 2013-03-25 10:56:57 -04:00
Michael DeHaan
518007a1ba Fix version added attribute, update docs URL 2013-03-25 10:56:32 -04:00
Lorin Hochstein
c9990b801e Strip quotes when parsing my.cnf
Remove leading/trailing single or double quotes when parsing the my.cnf
file in mysql_user and mysql_db.

Do this so that these modules parse the my.cnf file the same way that
the mysql client does.

From: http://dev.mysql.com/doc/refman/5.0/en/option-files.html

    You can optionally enclose the value within single quotation marks
    or double quotation marks, which is useful if the value contains a
    “#” comment character.

Fixes #2405
2013-03-25 09:53:04 -04:00
Bernhard Weitzhofer
b7f3d6ac92 postgresql_db: add args lc_collate, lc_ctype
Allow the specification of additional locale settings (lc_collate and lc_ctype) when creating a new database (state=present).

Fail if the specified database already exists with different locale/encoding settings. (These settings can't be changed for existing databases as far as I know, and failing seems better than suggesting that no change was necessary by returning changed=False)
2013-03-25 12:34:59 +01:00
Michael DeHaan
9be44c201a Merge pull request #2455 from robparrott/debuggin-help
inject a dictionary of avaiable variables and the environment into executor
2013-03-24 14:49:37 -07:00
Michael DeHaan
fe2f506514 Merge pull request #2462 from sfromm/issue2461
Make logging to journal match what goes to syslog on non-systemd hosts
2013-03-24 14:46:10 -07:00
Michael DeHaan
7f4718bca4 Merge pull request #2490 from szinck/devel
Added SunOS (Solaris, illumos, etc) service management
2013-03-24 14:45:07 -07:00
Michael DeHaan
4f4ee3693f Merge pull request #2440 from jochu/service-chkconfig-add
attempt to add service to chkconfig when suggested
2013-03-24 14:33:17 -07:00
Michael DeHaan
97d2c955a8 Merge pull request #2437 from hspencer77/additional-ec2-instance-attribute-support
Added additional filter options for instances for EC2 and Eucalyptus
2013-03-24 14:31:50 -07:00
Michael DeHaan
3d5aa5dc2c Merge pull request #2487 from dorfsmay/20130322
fixed doc regarding wild card pattern on groups.
2013-03-24 14:26:07 -07:00
Michael DeHaan
c163f5af9e Minor consistency tweak, pwd => password 2013-03-24 16:43:03 -04:00
michael@ansibleworks.com
ecda87cb63 Fixup docsite links 2013-03-24 16:41:20 -04:00
michael@ansibleworks.com
e086d6fd89 Doc updates 2013-03-24 16:41:20 -04:00
Michael DeHaan
b68f81a727 Merge pull request #2489 from vincentvdk/devel
rhn_channel module
2013-03-24 13:36:02 -07:00
Michael DeHaan
b5f3881e01 Merge pull request #2491 from tones111/to-upstream
Support systemd template service unit files
2013-03-24 13:35:36 -07:00
Shaun Zinck
8a6ef8c69a service: fix typo 'err' in SunOS service class 2013-03-24 13:47:56 -05:00
Vincent Van der Kussen
81a113ad6b Removed false info 2013-03-24 19:45:39 +01:00
Vincent Van der Kussen
255f2b868f Removed info about hard coded user/pwd in the documentation part 2013-03-24 09:16:58 +01:00
Paul Sbarra
b545b4c5fc service: add systemd template support 2013-03-23 23:13:51 -05:00
Paul Sbarra
4cfda2a965 service: fix systemd compilation error with --check 2013-03-23 23:07:18 -05:00
Vincent Van der Kussen
98406462d1 Made user and password options that can be passed to the module 2013-03-23 22:04:48 +01:00
Shaun Zinck
60bfd38820 Added SunOS (Solaris, illumos, etc) service management using svcadm and svcs commands 2013-03-23 16:02:54 -05:00
Vincent Van der Kussen
38c41b6f9e renamed module 2013-03-23 16:33:14 +01:00
Vincent Van der Kussen
3a626032ae added rhn_channel module 2013-03-23 16:32:10 +01:00
Vincent Van der Kussen
1388bb7859 Added module rhn_channel 2013-03-23 16:30:02 +01:00
Yves Dorfsman
5485451ddb fix doc regarding wild card pattern on groups. 2013-03-22 23:05:40 -06:00
Michael DeHaan
934029842e Merge pull request #2485 from jochu/bug-postgresql-quotes
Add quotes around postgresql database name
2013-03-22 13:15:53 -07:00
Jeffrey Chu
18b6091da1 Add quotes around postgresql database name 2013-03-22 13:03:11 -07:00
Michael DeHaan
bff581be4c Merge pull request #2482 from bladypirat/devel
disabled appending file with garbage when regexp didn't match.
2013-03-22 05:55:36 -07:00
Piotr Kweclich
2e4c02f93e disabled appending file with garbage when regexp didn't match. 2013-03-22 11:43:44 +01:00
Michael DeHaan
50461a686c Merge pull request #2481 from stoned/misc-comments-fix
Fix pathnames in comments
2013-03-21 21:10:42 -07:00
Stoned Elipot
86995d7786 Fix pathnames in comments 2013-03-22 02:11:58 +01:00
Michael DeHaan
b70c26dc45 Merge pull request #2466 from sfromm/issue2449
Limit scope of arguments to service_control() in service module
2013-03-20 19:07:16 -07:00
Michael DeHaan
5c1b436923 Merge pull request #2451 from lwade/pythoninterpreter
Changed python interpreter to be consistent in these modules as compared...
2013-03-20 18:58:28 -07:00
Michael DeHaan
cef817c3b4 Merge pull request #2458 from CodeBlock/devel
Fix broken virtualenv link in pip documentation.
2013-03-20 18:57:29 -07:00
Michael DeHaan
fce18d50ed Merge pull request #2468 from tgerla/devel
Add links to the ansible-examples repository in docs
2013-03-20 18:56:59 -07:00
Michael DeHaan
8d85b27ac9 Merge pull request #2472 from sfromm/issue2471
Fixes for get_remote_head in git module
2013-03-20 18:56:20 -07:00
Stephen Fromm
b694b9a66e Fixes for get_remote_head in git module
See issue #2471

This fixes get_remote_head() to be smarter about how to check remote
head.  It checks if it is a remote branch or tag and then checks for the
remote object id associated with it.  If it is sha1, get_remote_head()
returns it as-is since there doesn't appear to be a way to check a
remote repository for a specific object/sha1.  is_remote_tag() is added
to help out the new functionalit in get_remote_head().

In main(), if check_mode is true and version is a sha1, the module now
checks to see if the object is present.
2013-03-20 14:28:06 -07:00
Tim Gerla
242f988daf Add links to the ansible-examples repository 2013-03-20 09:45:41 -07:00
Stephen Fromm
5194a71a70 Limit scope of arguments to service_control() in service module
This fixes handling of arguments (module argument) in service_control().
It is now locally scoped such that modifications to it, in the case of a
systemd host, do not later impact subsequent calls to service_control().
See issue #2449.

Without patch:
ansible-service[6177]: Command /usr/bin/systemctl stop cups cups , daemonize True

With patch:
ansible-service[6475]: Command /usr/bin/systemctl start cups , daemonize True

I also updated the comments to reflect the case where systemd is really
being called.
2013-03-20 08:50:36 -07:00
Stoned Elipot
abe126fbd8 Define, when possible, the inventory_dir variable 2013-03-20 00:41:01 +01:00