Commit graph

310 commits

Author SHA1 Message Date
James Cammarata fe892fccb1 Merge remote-tracking branch 'svg/varsplugins_refactor' into svg_and_inventory_refactor 2014-07-07 14:16:37 -05:00
James Cammarata 3abcfee681 Merge branch 'pr_fix2' of https://github.com/carlanton/ansible into carlanton-pr_fix2 2014-06-10 10:05:00 -05:00
Alex Chistyakov bb1941a906 ansible-pull should respect inventory file settings because, say, Python interpreter path can be non-default on a host 2014-06-05 01:37:41 +04:00
Anton Lindström 0593473389 Enable use of vault password for --syntax-check, --list-hosts and --list-tasks 2014-05-20 22:18:32 +02:00
James Cammarata 0e7b9e5cfc Commenting out pkg_resources lines for now, as they break hacking/env-setup 2014-04-29 15:24:00 -05:00
James Cammarata 6879415f25 Merge branch 'feature/multi-version-import' of https://github.com/abadger/ansible into abadger-feature/multi-version-import 2014-04-29 14:41:57 -05:00
jctanner 63f66a0d3b Merge pull request #6585 from eggsby/patch-3
Allow vault encrypted vars as extra_vars
2014-04-04 13:40:52 -04:00
James Tanner 5795796546 Remove limitation on number of files for encrypt subcommand in ansible-vault 2014-04-02 13:33:11 -04:00
James Tanner 95a283ccaa Addresses #4109 Remove debug print statement 2014-03-27 11:51:22 -04:00
James Tanner c1f4142a29 Fixes #4109 Filter plays by tags when using --list-hosts 2014-03-27 11:47:49 -04:00
Serge van Ginderachter f8ea93c732 Move inventory.set_playbook_basedir from ansible-playbook to playbook constructor 2014-03-25 22:12:01 +01:00
Serge van Ginderachter f6a55a3552 Refactor vars_plugins (host/group_vars)
Split out parsing of vars files to per host and per group
parsing, instead of reparsing all groups for each host. This enhances
performance.

Extend vars_plugins' API with two new methods:
* get host variables: only parses host_vars
* get group variables: only parses group_vars for specific group
The initial run method is still used for backward compatibility.

Parse all vars_plugins at inventory initialisation, instead of
per host when touched first by runner. Here we can also loop through
all groups once easily, then parse them.
This also centralizes all parsing in the inventory constructor.

	modified:   bin/ansible
	modified:   bin/ansible-playbook
	modified:   lib/ansible/inventory/__init__.py
	modified:   lib/ansible/inventory/vars_plugins/group_vars.py
2014-03-25 22:12:01 +01:00
jctanner adbd6865da Merge pull request #6681 from zytek/devel
Properly revert changes introduced in #6579
2014-03-25 13:52:34 -04:00
Jakub Paweł Głazik 6b53ac8a9a strip() vault password file 2014-03-25 16:10:33 +01:00
Jakub Paweł Głazik 08ba18668b Strip() vault password file 2014-03-25 16:10:04 +01:00
James Tanner 9169a11088 Fixes #4777 add --force-handlers option to run handlers even if tasks fail 2014-03-24 10:28:48 -04:00
James Tanner 8c2e1e2baa Addresses #6579 Disallow vault passwords with newline characters by stripping them in utils 2014-03-19 15:56:14 -04:00
James Tanner 409044155d Fixes #6579 allow for vault passwords ending with newline chars
Also add a unit test for vaulteditor to verify 1.0 passwords with newline chars.
2014-03-19 14:38:11 -04:00
Thomas Omans 1727fddf50 Allow vault encrypted vars as extra_vars
Forward the vault_password to the yaml file utility.
2014-03-19 10:09:41 -07:00
Michael DeHaan 8eb547edaa Merge pull request #6531 from bob-smith/formatting
Add space after full stop in ansible-galaxy help
2014-03-17 16:37:02 -04:00
James Tanner c09e46517e Merge pull request #5864 from stevetjoa/ansible
adding -K flag for ask-sudo-pass to ansible-pull
2014-03-17 15:15:25 -04:00
James Tanner 70f4e0807c Fixes #6467 ansible command should not assume sudo if ask_sudo_pass or sudo_user 2014-03-17 15:03:05 -04:00
John Barker aa87afaa87 Add space after full stop in ansible-galaxy help 2014-03-17 18:52:44 +00:00
Michael DeHaan 71977bfe71 Merge pull request #5720 from mschurenko/devel
added random sleep option to ansible-pull
2014-03-16 15:41:17 -05:00
Michael DeHaan 0ab6586222 Merge pull request #5890 from ingmar/ansiblepull-extravars-5707
ansible-pull support for -e (--extra-vars) option (same as ansible-playbook) #5707
2014-03-16 15:33:58 -05:00
Michael DeHaan 887cb7652a Merge pull request #6004 from res0nat0r/fix_ansible-doc_snippets
Fix ansible-doc option output.
2014-03-16 15:23:29 -05:00
Michael DeHaan 0dde3b7080 Merge pull request #5895 from trbs/listtasks_honors_limit
make --list-tasks honor --limit
2014-03-16 13:40:13 -05:00
Cristian Ciupitu 0749112286 Micro-optimization: replace s.find(x)!=-1 with x in s
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
2014-03-16 13:10:28 -04:00
Toshio Kuratomi 0fefab6651 Require a recent enough version of pycrypto and see that playbook and vault ues it. 2014-03-14 11:55:06 -07:00
James Tanner 0d6f6ad282 Implement new default cipher class AES256 2014-03-10 16:15:44 -05:00
Francesc Esplugas 0fd5829f10 get rid of newline chars when reading password file 2014-03-02 12:41:07 +01:00
James Tanner e3672dded0 Remove breakpoint 2014-02-26 14:53:36 -05:00
James Tanner b74105c689 Add --vault-password-file to bin/ansible-pull 2014-02-26 14:52:57 -05:00
James Tanner 35def422a3 Addresses #6188 Add --vault-password-file to bin/ansible and bin/ansible-playbook 2014-02-26 11:01:03 -05:00
James Tanner 7acd2f3a2d Addresses #6188 Add --vault-password-file option to the ansible-vault command 2014-02-26 10:01:59 -05:00
James Tanner 52a8efefba Vault rewrite, pass 1 2014-02-24 13:09:36 -05:00
James Tanner 7fe3db408d Fixes #6082 Set vault password to None by default 2014-02-19 21:26:12 -05:00
James Tanner 9ba053c885 Fix ansible cli to use vault for group var files 2014-02-19 11:23:46 -05:00
James Tanner aa46ab1d86 Fix function name 2014-02-19 11:05:08 -05:00
James Tanner 427b8dc78d Ansible vault: a framework for encrypting any playbook or var file. 2014-02-18 15:35:12 -05:00
James Cammarata 52c9c1dc39 Fixing usage string in ansible-galaxy install for role files 2014-02-15 09:57:52 -06:00
Stefhen Hovland e1b7278265 Only display equals sign in summary for required options. 2014-02-14 00:12:29 -05:00
Stefhen Hovland 30cabddf76 Ensure option output is sorted. 2014-02-14 00:11:21 -05:00
trbs b7df767065 make --list-tasks honor --limit 2014-02-06 15:49:06 +01:00
Ingmar Hupp 1f0cdc5ec8 ansible-pull support for -e (--extra-vars) option (same as ansible-playbook) #5707 2014-02-05 18:53:37 +00:00
Steve Tjoa 335bc1ee5c adding -K flag for ask-sudo-pass to ansible-pull 2014-02-03 12:20:04 -08:00
Michael DeHaan 3b8fd62ff9 More site rename things. 2014-01-28 20:29:42 -05:00
Michael DeHaan d07a3b5e9b AnsibleWorks -> Ansible 2014-01-28 20:29:42 -05:00
James Cammarata fc30467593 Adding an "Example Playbook" section to the README template for ansible-galaxy
Fixes 5397
2014-01-24 15:39:30 -06:00
James Cammarata 593098108e Adding suggested licenses to the ansible-galaxy meta template 2014-01-24 15:34:01 -06:00