Commit graph

5954 commits

Author SHA1 Message Date
George Miroshnykov
c642ba77ae Added basic support for hash_behaviour=merge in roles
Dict vars passed to roles are now properly merged
instead of simply overriding dict vars that are
coming from vars_files.
2013-06-19 09:14:20 +03:00
Jesse Keating
1074896105 make name the parameter, with hostname as alias
name is used throughout Ansible, it's the "standard". This change
applies that standard to the add_host routine and updates the docs to
reflect that. Related to https://github.com/ansible/ansible/pull/3254
2013-06-18 21:11:52 -07:00
Lorin Hochstein
1ef1b03bf6 django_manage: Pass --noinput to migrate
The django 'migrate' command should receive the --noinput command,
otherwise it can block waiting for user input.
2013-06-18 23:05:40 -04:00
Patrick Callahan
b5b862fe6f bug fix: modify get_device_facts to handle servers with multiple pci domains
On machines with multiple pci domains get_device_facts would fail to
find a matching pci device causing setup to fail. Also on some platforms
there is additional information between the pci information and 'host'.
Modified get_device_facts to call lspci with the -D option and modified
the regex to account for the pci domain and to be more selective.
2013-06-18 22:48:05 -04:00
Tim Gerla
f2cf8d3e67 Fine-tune Ansible control system OS requirements a bit 2013-06-18 18:19:58 -07:00
Michael DeHaan
fc2d25eb82 Merge pull request #3127 from bennojoy/devel
bug fix for #3077, environment settings for script
2013-06-18 17:57:10 -07:00
Michael DeHaan
575e052c6c Merge pull request #3147 from toshywoshy/setup_mtab_without_bind
changed get_mount_facts to ignore mount types 'none'
2013-06-18 17:56:49 -07:00
Michael DeHaan
132c89e681 Merge branch 'callbackinit' of git://github.com/sergevanginderachter/ansible into devel 2013-06-18 20:52:43 -04:00
Michael DeHaan
51bda285bd update changelog 2013-06-18 20:33:32 -04:00
Michael DeHaan
1e3ab98a13 Merge pull request #3219 from arturaz/devel
datadog_event module: submit your events to DataDog service.
2013-06-18 17:31:52 -07:00
Michael DeHaan
dd7f7d5593 Merge branch 'file_hard' of git://github.com/bcoca/ansible into devel
Conflicts:
	library/files/file
2013-06-18 20:31:05 -04:00
Michael DeHaan
e90d0be199 Update the changelog with everything that has happened so far. 2013-06-18 20:28:46 -04:00
Michael DeHaan
61ac8d03af Clarify module docs 2013-06-18 20:19:29 -04:00
Michael DeHaan
31b63b033b Merge conflict 2013-06-18 20:18:17 -04:00
Michael DeHaan
96134d003e Merge remote branch 'origin/devel' into devel 2013-06-18 20:17:31 -04:00
Michael DeHaan
51ba3d8c3d Merge pull request #3230 from sayap/openrc
Add OpenRC support to the service module.
2013-06-18 17:13:06 -07:00
Michael DeHaan
273f37b394 Merge pull request #3255 from jlund/sha256-example-cleanup
Removed merge conflict header
2013-06-18 17:08:59 -07:00
Michael DeHaan
7193ff5fbf Merge pull request #3250 from gildegoma/more_magical_ansible_ssh_user
Make 'ansible_ssh_user' available in templates
2013-06-18 17:08:29 -07:00
Michael DeHaan
2f1420f071 Merge pull request #3258 from j2sol/apt-doc
pkg option of apt is not required
2013-06-18 16:56:35 -07:00
Michael DeHaan
43fba4e307 Merge pull request #3256 from DMBuce/pkgbuild-update
Fix typo in PKGBUILD
2013-06-18 16:56:03 -07:00
Michael DeHaan
cbd54f6c2e Merge pull request #3257 from jimt/patch-1
spelling ansbile->ansible
2013-06-18 16:53:43 -07:00
Jesse Keating
86bc2ec08a pkg option of apt is not required
You can use apt module with update_cache and without specifying a
package. Update the docs to reflect this.
2013-06-18 16:25:46 -07:00
Jim Tittsler
240a52906e spelling ansbile->ansible 2013-06-19 10:37:02 +12:00
Buce
e04ee519ef Fix typo in PKGBUILD
ansbile.cfg -> ansible.cfg
2013-06-18 17:31:34 -04:00
Joshua Lund
bb4de94937 Removed merge conflict header 2013-06-18 15:01:01 -06:00
Michael DeHaan
b4358d1300 Merge branch 'apt_key_file' of git://github.com/veeti/ansible into devel
Conflicts:
	library/packaging/apt_key
2013-06-18 16:18:31 -04:00
Michael DeHaan
a94e404a97 Merge pull request #3236 from lwade/ec2_placementzone
Added placement_group parameter for cluster compute. Issue 3232.
2013-06-18 13:14:03 -07:00
Tim Gerla
6f426f7986 Explicitly mention the Linux requirement for the Ansible machine, and remove a vestigial heading. 2013-06-18 12:12:37 -07:00
Michael DeHaan
89ee762ab7 Merge pull request #3247 from SirScott/vars_prompt_docs
Document the 'default' argument for vars_prompt.
2013-06-18 11:48:49 -07:00
Michael DeHaan
583b3e5957 Merge pull request #3251 from jlund/sucess-typo-fix
Fixed a few small typos
2013-06-18 11:47:49 -07:00
Michael DeHaan
2123507315 Merge branch 'sha256' of git://github.com/jlund/ansible into devel
Conflicts:
	library/network/get_url
2013-06-18 14:46:57 -04:00
Michael DeHaan
92754065bf Remove debug statement. 2013-06-18 14:41:52 -04:00
Joshua Lund
ba853b8c1a Fixed a few small typos 2013-06-18 12:26:40 -06:00
Michael DeHaan
bac81be3f9 Add undefined variables feature to example config file. 2013-06-18 13:31:08 -04:00
Michael DeHaan
5a504e3a3b Tweak error messages for undefined variables feature. 2013-06-18 13:30:02 -04:00
Michael DeHaan
637983cf31 cleanup example config file + Squashed commit of the following:
commit c36b66dc952dfff91043ecbca56cf3f1f8f00703
Merge: 240d7bf f4cf934
Author: Michael DeHaan <michael@ansibleworks.com>
Date:   Tue Jun 18 13:04:51 2013 -0400

    Merge branch 'unevaluated-vars' of git://github.com/lorin/ansible into lorin_undefined

    Conflicts:
    	lib/ansible/runner/__init__.py

commit f4cf934367
Merge: 2531440 07a1365
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 6 11:07:41 2013 -0400

    Merge branch 'devel' into unevaluated-vars

commit 253144045c
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu Jun 6 11:06:37 2013 -0400

    Fail template from file on undefined vars

    If config option is set, raise an exception if templating from a
    file and a variable is undefined.

commit aecb71d8b7
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 5 17:12:12 2013 -0400

    Add fail_on_undefined flag

    Add a fail_on_undefined flag to the template and template_from_string methods.

    If this flag is true, then re-raise the ninja2.excpetions.UndefinedError instead of
    swallowing it.

commit cbb1808f05
Merge: d4bbf49 41425fb
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Wed Jun 5 16:14:12 2013 -0400

    Merge branch 'devel' into unevaluated-vars

commit d4bbf492b0
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Mon Jun 3 19:46:13 2013 -0400

    template: Raise UndefinedError exception

    In template_from_string, raise an undefined error if it occurs.

    Have the caller catch it and throw an AnsibleUndefinedVariable

commit c947802805
Merge: 8d919d6 be33bcf
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Mon Jun 3 10:09:43 2013 -0400

    Merge branch 'devel' into unevaluated-vars

commit 8d919d6c97
Merge: 0f68ad8 b8630d2
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu May 30 16:27:48 2013 -0400

    Merge branch 'devel' into unevaluated-vars

commit 0f68ad8193
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Thu May 30 14:32:03 2013 -0400

    Optionally fail task on undefined variables

    This patch introduces a new configuration option called
    error_on_undefined_vars, which defaults to false.

    If this option is set to true, then a task which has unevaluated
    variables in its arguments will fail instead of running. Output looks
    like this:

        TASK: [set rabbitmq password] *************************************************
        fatal: [10.20.0.7] => Undefined variables: rabbitmq_user, rabbitmq_password
2013-06-18 13:24:30 -04:00
Gilles Cornu
48fe7ac19d Enlarge scope of 'ansible_ssh_user' magic variable
Allow to use ansible_ssh_user variable in `sudo_user` or `when` clauses
2013-06-18 17:53:52 +02:00
Scott Sturdivant
cc12b85e49 Document the 'default' argument for vars_prompt. 2013-06-18 09:25:51 -06:00
Michael DeHaan
240d7bf197 Use new site URLs in README 2013-06-17 22:20:31 -06:00
Michael DeHaan
25b43cf6ec Merge pull request #3231 from jpmens/docs_more
Docs: consistently format playbook EXAMPLES
2013-06-17 20:48:02 -07:00
Michael DeHaan
cadecc0a52 Merge pull request #3240 from SirScott/vars_prompt_defaults
Display default value in prompt when using vars_prompt
2013-06-17 20:31:50 -07:00
Michael DeHaan
6d19150bb1 Merge pull request #3242 from bcoca/mount_findbin
now mount/unmount binaries are searched for instead of hardcoded
2013-06-17 20:31:12 -07:00
Vincent Viallet
9af24f5345 Merge branch 'a_devel' into digitalocean 2013-06-18 10:46:42 +08:00
Vincent Viallet
d4b5122ad9 Rename digital ocean module to digital_ocean, add documentation. 2013-06-18 10:45:45 +08:00
Brian Coca
c9c7b01620 now mount/unmount are searched for instead of hardcoded
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-06-17 17:01:35 -04:00
Scott Sturdivant
b10b676158 Print the default value if one is provided. 2013-06-17 14:15:31 -06:00
Veeti Paananen
77159d21da Add apt_key examples for file and data 2013-06-17 18:23:40 +03:00
Bruce Pennypacker
898889d20e added try/except around conn.get_all_dbinstances 2013-06-17 09:42:42 -04:00
Bruce Pennypacker
d25622f17e changed 'action' to 'command'. Fixed a tab issue. 2013-06-17 09:39:45 -04:00
lwade
886a71e8eb Added placement_group parameter for cluster compute. 2013-06-17 14:35:53 +01:00