Commit graph

3620 commits

Author SHA1 Message Date
Michel Blanc
8eb7d740b0 Fixes hash merging
No need for deep copy (vars are essentially immutable once loaded, there
should not be any modifications)
2013-01-24 00:53:12 +01:00
Michel Blanc
e28e538c6e Adds user-selectable hash merging support in vars
Hash variables are currently overriden if they are redefined. This
doesn't let the user refine hash entries or overriding selected keys,
which can, for some, be a desirable feature.
This patch let the user force hash merging by setting the
hash_behaviour value to "merge" (without the quotes) in ansible.cfg

However, by default, ansible behaves like it always did and if any value
besides "merge" is used ("replace" is suggested in the example ansible.cfg
file), it will also behave as always.
2013-01-23 21:39:34 +01:00
Daniel Hokka Zakrisson
51180fa344 Merge pull request #1900 from bostrick/devel
protect PluginLoader._extra_dirs from appending None
2013-01-23 11:03:24 -08:00
Bowe Strickland
2b3d6d4545 protect PluginLoader._extra_dirs from appending None
PluginLoader.add_directory() can receive None from, for example, 
Inventory.add_directory(self.basedir()) if host_list is a custom list.
None has no reasonable interpretation other than ignore it.
2013-01-23 13:55:12 -05:00
Daniel Hokka Zakrisson
a117944d0f Make env-setup work on Python 3 2013-01-23 19:48:13 +01:00
Daniel Hokka Zakrisson
b8d0638449 Merge pull request #1897 from qjcg/pacman-pkg-mgr
Add pacman to list of package managers in setup module
2013-01-23 08:45:18 -08:00
John Gosset
54ef6015f6 add pacman to list of package managers in setup module 2013-01-23 11:03:05 -05:00
Daniel Hokka Zakrisson
950e3052b8 Merge pull request #1890 from elventear/rabbitmq_contrib
RabbitMQ Contrib
2013-01-23 02:36:45 -08:00
Daniel Hokka Zakrisson
a4b22b3a30 Merge pull request #1894 from ron1/devel
Update examples/ansible.cfg with sudo_exe
2013-01-23 02:35:37 -08:00
ron1
7d67ecfb2d Update examples/ansible.cfg with sudo_exe 2013-01-23 00:58:16 -05:00
Michael DeHaan
3e75219f28 Merge pull request #1893 from bct/directory-organization-fix
Make diagram of Directory Organization best practice match the text.
2013-01-22 17:12:36 -08:00
Brendan Taylor
ab63c24358 Make diagram of Directory Organization best practice match the text.
The text and playbook content assumed a directory structure that didn't
match the diagram.
2013-01-22 16:00:14 -07:00
Pepe Barbe
9dfa3ca88f Add my repo for RabbitMQ stuff 2013-01-22 13:23:58 -06:00
Daniel Hokka Zakrisson
d4c0180494 Make service module daemonize for all the broken "daemons" out there 2013-01-22 20:21:08 +01:00
Daniel Hokka Zakrisson
94a1c221bc Update variable precedence section with current rules 2013-01-22 16:56:04 +01:00
Daniel Hokka Zakrisson
48f48e8a44 module must be passed to repolist too 2013-01-22 16:27:08 +01:00
Daniel Hokka Zakrisson
7fadf6c976 Merge pull request #1887 from elventear/yum_fix
module needs to be passed to local_nvra
2013-01-22 07:26:15 -08:00
Pepe Barbe
8b4bd2ec3e module needs to be passed to local_nvra 2013-01-22 09:03:45 -06:00
Daniel Hokka Zakrisson
a16ddb57c1 Default module search path is included already
Adding it to runner's module_path makes it override local modules.
2013-01-22 15:42:49 +01:00
Daniel Hokka Zakrisson
35b58955d6 Fix paramiko for when no private key is specified 2013-01-21 21:48:02 +01:00
Michael DeHaan
ea45423f92 Merge pull request #1885 from vincentvdk/devel
added info of required packages to build rpms
2013-01-21 12:36:29 -08:00
Vincent Van der Kussen
4af54e8a3b stylistic change. 2013-01-21 20:49:43 +01:00
Michael DeHaan
ef38e9f0e6 Merge pull request #1875 from cocoy/vars_prompt_default
Adding default on vars_prompt
2013-01-21 06:57:50 -08:00
Michael DeHaan
1cae679271 Merge pull request #1881 from fdavis/when_changed_fail
add when_changed when_failed example to docsite
2013-01-21 06:57:02 -08:00
Michael DeHaan
dabe49277a Merge pull request #1883 from tgerla/devel
--private-key tilde handling
2013-01-21 06:52:57 -08:00
Vincent Van der Kussen
614826bcda Fixed my typo and forgot a package 2013-01-21 15:28:16 +01:00
vincent Van der Kussen
80f82f80d8 added info of required packages to build rpms 2013-01-21 15:22:12 +01:00
fdavis
7899e29395 add when_changed when_failed examples to docsite
whitespace fix
2013-01-20 15:50:21 -08:00
Tim Gerla
495c4e6cff mention tilde fixes for --private-key in changelog 2013-01-20 13:34:38 -08:00
Tim Gerla
b814f3dc66 Correct --private-key argument name in Getting Started 2013-01-20 13:24:03 -08:00
Tim Gerla
4c64d0d6be Expand ~ shell shortcuts for the --private-key argument 2013-01-20 13:16:29 -08:00
Michael DeHaan
7df3d811f2 Update changelog for things done for 1.0 thus far. 2013-01-20 11:30:24 -05:00
Michael DeHaan
35c7ebf7a4 Revert "Update lib/ansible/utils/__init__.py"
Reported hanging of no-password sudo in some cases.  Need to explore.

This reverts commit 87f6739e20.

Conflicts:

	lib/ansible/utils/__init__.py
2013-01-20 09:05:07 -05:00
Michael DeHaan
89eee7b868 Merge pull request #1880 from ron1/devel
Support sudo alternatives that offer sudo-compatible interfaces
2013-01-19 15:23:22 -08:00
ron1
280660b8a7 Support sudo alternatives that offer sudo-compatible interfaces 2013-01-19 08:40:32 -05:00
Rodney Quillo
395093e0bf Move default arguments to the end of the function call. 2013-01-19 08:34:47 +08:00
Michael DeHaan
e7223760c4 Merge pull request #1810 from davixx/sysctl
new module: sysctl to handle sysctl entry
2013-01-18 15:20:45 -08:00
Michael DeHaan
c66d3200f8 Merge pull request #1670 from Afterburn/devel
Pacman module
2013-01-18 15:19:47 -08:00
Michael DeHaan
c8fc353bc3 Merge pull request #1811 from fdavis/devel
add when_{failed,changed}, and extended when_{set,unset}
2013-01-18 15:18:00 -08:00
Michael DeHaan
1721357a49 Merge pull request #1824 from jvantuyl/apt-key-module
add apt_key module
2013-01-18 15:16:32 -08:00
Michael DeHaan
fa953ba6b3 Merge pull request #1867 from c0rner/devel
get_service_status() is now using self.service_control() to check status
2013-01-18 15:15:07 -08:00
Michael DeHaan
bf03b0ee9a Merge pull request #1874 from fdavis/cfg
add filter_plugins to example ansible.cfg
2013-01-18 15:10:14 -08:00
Michael DeHaan
bcdbb19549 Merge pull request #1872 from runekaagaard/devel
Service mod.: Proper(?) handling of return code 69
2013-01-18 15:09:58 -08:00
Michael DeHaan
224b503b78 Merge pull request #1878 from leucos/patch-1
Fix sudo user env
2013-01-18 15:08:39 -08:00
Michel Blanc
87f6739e20 Update lib/ansible/utils/__init__.py
Adds -i to  make_sudo_cmd so target user's environment gets loaded when configurationslike this are used :


    - hosts: ubuntu 
      name: Install ruby for the configured ruby user 
      sudo: True 
      sudo_user: rubyuser 
      # should be ${ruby_user}, but can't for now because of #1665 
      tasks: 
      - name: Gets current ruby version 
        action: shell rbenv version 
        register: ruby_current_version
2013-01-18 16:03:50 +01:00
Rodney Quillo
7ae100611c Adding default on vars_prompt 2013-01-18 19:00:57 +08:00
fdavis
a278a60c34 add filter_plugins to example ansible.cfg 2013-01-17 13:13:02 -08:00
Rune Kaagaard
27ab2e55d3 Service mod.: Proper(?) handling of return code 69
This adds "69" to the return codes from the status command that should be
considered as not running. At least "django-celery" uses this return code,
maybe others::

    /venv/bin/python /code/project/manage.py celeryctl status
    echo $? # 69 when not running.

A bit of googling let me to http://tldp.org/LDP/abs/html/exitcodes.html and
on a Ubuntu Server 12.10 I get::

    ~# cat /usr/include/sysexits.h | grep 69
    #define EX_UNAVAILABLE	69	/* service unavailable */

I'm not sure if the content of sysexits.h is the same on other OS'es.
2013-01-17 10:13:05 +01:00
Jayson Vantuyl
ad6373430b add apt_key module
Pretty straightforward.  Give it a URL with an exported GPG key for signing an
Apt repository.  It downloads it and will install it using apt-key.  It's even
smart enough to tell if it's already there (i.e. actually tells you if it
changed or not).
2013-01-15 17:34:38 -08:00
root
471ee0c90d get_service_status() is now using self.service_control() to check status
Fixes a bug where init-scripts were not used
2013-01-14 12:37:55 +01:00