Commit graph

13767 commits

Author SHA1 Message Date
Toshio Kuratomi
1ed1af6cb4 Make extra_vars into unicode string type early
Fixes v2 for #10106
2015-02-02 13:58:21 -08:00
Toshio Kuratomi
6d788629a2 Be explicit about unicode str transformation
Fixes #10126
2015-02-02 13:37:31 -08:00
Toshio Kuratomi
bd7ac7fd7d Error message has changed; scrape the new message 2015-02-02 12:05:01 -08:00
Toshio Kuratomi
97438f0039 Update the modules 2015-02-02 10:25:59 -08:00
Toshio Kuratomi
b2c7b911bc v2/plugins/filter is now a symlink as it does not differ between v1 and v2 2015-02-02 10:25:09 -08:00
Toshio Kuratomi
03e213a272 Change the v2 filter plugins into a symlink to v1 as the plugins are the same for both 2015-02-02 10:25:09 -08:00
Toshio Kuratomi
0e5f86cce4 Import hash functions for filters from the new location so the plugins will work on v1 and v2 2015-02-02 10:25:09 -08:00
Toshio Kuratomi
1011959d88 Move the hashing util functions to their own file to mirror v2 2015-02-02 10:25:09 -08:00
Toshio Kuratomi
e702a28496 Comment for why we have checksum and checksum_s 2015-02-02 10:25:09 -08:00
Brian Coca
5eafa1e7c3 Merge pull request #9825 from kalefranz/ec2-inventory-tags
Allow ec2 tags to be used to address servers in ec2 dynamic inventory.
2015-02-02 12:58:58 -05:00
Toshio Kuratomi
d7f5979870 Merge pull request #10151 from ansible/pr-9560
Modified version of PR 9560
2015-02-02 08:56:15 -08:00
Toshio Kuratomi
b3af2f9bee Better error message 2015-02-02 08:52:19 -08:00
Toshio Kuratomi
f6e8ddfd5f Use pass instead of bare None value 2015-02-02 08:52:19 -08:00
Toshio Kuratomi
624a8dd1d9 Replace large if-elif-else blocks with a dict-dispatcher 2015-02-02 08:52:19 -08:00
Toshio Kuratomi
616fda5767 First try at only failing if the filter is actually used. 2015-02-02 08:52:19 -08:00
Maciej Delmanowski
7e46554160 Add ipaddr() filter plugin 2015-02-02 08:52:19 -08:00
Brian Coca
4198b0a9a5 Merge pull request #6641 from kavu/6346_accept_hostkey_and_key_file
Add key_file and accept_hostkey to ansible-pull
2015-02-02 09:48:41 -05:00
Brian Coca
3d858b7c02 Merge pull request #10150 from erikaheidi/patch-2
[Vagrant guide] Updating private key location
2015-02-02 08:35:16 -05:00
Erika Heidi
c20c6d4eb4 [Vagrant guide] Updating private key location
Since Vagrant 1.7.0, released in December 2014, the private key file is autogenerated and has a new location - check the changelog for more info: [version 1.7.0 changelog](https://github.com/mitchellh/vagrant/blob/master/CHANGELOG.md#170-december-9-2014)
2015-02-02 13:30:17 +01:00
Toshio Kuratomi
607ee95836 Merge pull request #10146 from mscherer/fix_doc
Fix documentation on hostfile vs inventory , follow up of #10130
2015-02-01 14:27:43 -08:00
Michael Scherer
d6edbeb4d0 Fix documentation on hostfile vs inventory , follow up of #10130 2015-02-01 12:12:40 +01:00
Max Riveiro
9e8dae7498
Fix #6346. Add key_file and accept_hostkey to ansible-pull
Signed-off-by: Max Riveiro <kavu13@gmail.com>
2015-01-31 18:40:20 +03:00
Michael DeHaan
4fb7c1bff4 Set email to my personal address, thanks everyone!
http://michaeldehaan.net/post/109595670406/happy-trails-ansible
2015-01-30 17:28:37 -05:00
Brian Coca
17666a1939 changed default for new retry path to be teh same as current
also added commented out entries in ansible.cfg to show other options
2015-01-30 15:18:58 -05:00
Brian Coca
540d13cf52 Merge pull request #9404 from mmoya/configure-retry-files
Configure retry file usage and location
2015-01-30 15:14:27 -05:00
Brian Coca
d4a89c8ead moved from callback_output to popen to keep 2.6 compat 2015-01-30 15:09:09 -05:00
Andreas Reischuck
6609f3ac03 fix suggested by @aikomastboom 2015-01-30 21:04:52 +01:00
Brian Coca
368285b351 initial draft virtualbox inventory script 2015-01-30 10:53:21 -05:00
Toshio Kuratomi
363a47b48b Merge pull request #10133 from netroby/feature/update-repo-sh
Add shell script to fast update ansible repo
2015-01-30 07:52:42 -08:00
Toshio Kuratomi
4b89eb293f port fix for https://github.com/ansible/ansible/pull/10129 to v2 2015-01-30 07:51:19 -08:00
Toshio Kuratomi
ca35d138f1 Update modules 2015-01-30 07:46:36 -08:00
Toshio Kuratomi
f355c11a3f Merge pull request #10129 from RadishTheHut/memfacts-fix
Fix for memory fact gathering
2015-01-30 07:44:58 -08:00
Brian Coca
dfe629a872 Merge pull request #10137 from nmeum/devel
Saner ansible-pull output
2015-01-30 10:18:35 -05:00
Sören Tempel
773849d421 Only write actual errors to stderr 2015-01-30 15:55:37 +01:00
Brian Coca
7ab95e10f0 updated to latest core devel 2015-01-30 08:29:58 -05:00
ZhiFeng Hu
e63c03d60f Move update.sh to hacking repository ,see #10081 2015-01-30 14:19:47 +08:00
Patrick McConnell
04b2c698ba Updated memory facts fix using dict.get() to avoid KeyError 2015-01-30 05:59:34 +01:00
Toshio Kuratomi
747cc26ae1 Update modules 2015-01-29 18:31:15 -08:00
Toshio Kuratomi
be9b445245 Document the force=no changes for version control modules 2015-01-29 18:30:43 -08:00
ZhiFeng Hu
d4864eabdc Add shell script to fast update ansible repo 2015-01-30 08:45:46 +08:00
James Cammarata
c978c77796 Fixing more v2 bugs 2015-01-29 16:44:01 -06:00
Toshio Kuratomi
f20967078e Fixes to @RadishTheHut's memory facts as discussed in
https://github.com/ansible/ansible/pull/10129#issuecomment-72077500

* Switch default value from 0 to None.
* Prefill keys with default value so that determining calculated values
  is easier
2015-01-29 12:09:19 -08:00
Toshio Kuratomi
d57f7b4b9e Merge pull request #10130 from bcoca/inventory_consistent_naming
made inventory consistent in config file, deprecated old config hostfile
2015-01-29 10:48:03 -08:00
Marc Abramowitz
372a29744b Make AnsibleError a plain ol' exception
Python's Exception constructor already takes a `message` as a parameter,
which you can then get at by doing str(e) (e.message was deprecated).

The reason I bothered to make this change was because I was debugging
with pdb and I noticed that AnsibleErrors don't give useful information
in pdb (probably because they don't have a __repr__ method that prints
the `msg` attribute).

    (Pdb) c
    > /Users/marca/dev/git-repos/ansible/lib/ansible/runner/__init__.py(599)_executor()
    -> msg = str(ae)
    (Pdb) ae
    AnsibleError()
2015-01-29 10:36:06 -08:00
Brian Coca
c73254543a made env var also consistent 2015-01-29 13:32:00 -05:00
Brian Coca
4fd760467b made inventory consistent in config file, deprecated old config hostfile 2015-01-29 13:28:33 -05:00
Brian Coca
751701c6f2 Merge pull request #9672 from quinot/topic/lineno-in-inventory-err
Report location (filename and line number) for inventory syntax errors
2015-01-29 12:36:30 -05:00
James Cammarata
171a67cfef Tweaking role path searching in v2 to be a bit more like v1 2015-01-29 10:56:04 -06:00
Brian Coca
e4a7b973fd Merge pull request #9128 from msabramo/expose_more_user_facts
Expose more facts about user on host system
2015-01-29 09:55:30 -05:00
Patrick McConnell
0c3a273805 Fix for memory fact gathering
I have a host which started to fail while gathering facts after the addition
of expanded memory facts in PR #9839:

Traceback (most recent call last):
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 4278, in <module>
    main()
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 137, in main
    data = run_setup(module)
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 81, in run_setup
    facts = ansible_facts(module)
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 4217, in ansible_facts
    facts.update(Hardware().populate())
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 2339, in populate
    self.get_memory_facts()
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 2375, in get_memory_facts
    'cached': memstats['swapcached']
KeyError: 'swapcached'

My problem host doesn't have SwapCached in /proc/meminfo. It may be better to
set defaults for these keys, since the values provided by /proc/meminfo can
change from version to version.
2015-01-29 15:00:01 +01:00