Commit graph

9364 commits

Author SHA1 Message Date
Matt Martz
4b400ca5e9 Only used stripped data for testing if the file is json, but used unstripped when actually parsing. Fixes #6348 2014-03-10 13:43:34 -05:00
Matthew Riedel
5875d19f4d Returning 'NA' when no virtualization found 2014-03-10 11:58:04 -04:00
Michael DeHaan
678fb4ffbe Merge pull request #6368 from jjshoe/patch-1
Make this statement understandable grammatically
2014-03-10 10:24:16 -05:00
jjshoe
2ccbdd65c1 Make this statement understandable grammatically 2014-03-10 09:02:51 -05:00
Federico Feroldi
b9ab31ebd8 Fix for #6365: cloudformation module fails to update if stack exists 2014-03-10 13:11:09 +01:00
Michael DeHaan
53fd5295dc Merge pull request #6351 from franckcuny/typo
Remove mention to AWS in Linode's inventory script.
2014-03-09 11:27:55 -05:00
Michael DeHaan
d636c93a9b Merge pull request #6352 from sethwoodworth/patch-1
Spelling correction in loop warning, removes unnecessary c
2014-03-09 11:27:11 -05:00
Seth Woodworth
1d5db30067 Updates loop warning, removes unnecessary c 2014-03-09 00:19:28 -05:00
Franck Cuny
54b3262e71 Remove mention to AWS in Linode's inventory script. 2014-03-08 17:14:10 -08:00
James Cammarata
04a6dc6d12 Check for skipped tags in passed role variables before adding to them
Fixes #6330
2014-03-08 18:55:42 -06:00
Michael DeHaan
c79b5ea4b4 Merge pull request #6344 from alimony/patch-1
Touch up documentation strings for DigitalOcean.
2014-03-08 18:41:48 -06:00
Michael DeHaan
734a16afb4 Merge pull request #6347 from dwheaton/patch-1
Update playbooks_variables.rst
2014-03-08 18:32:26 -06:00
David Wheaton
00ed2b811f Update playbooks_variables.rst
incorrect/confusing wording in Jinja2 note?
2014-03-08 13:53:16 -08:00
Michael DeHaan
5f3ea7512f Merge pull request #6343 from dolph/devel
spelling correction for "separate"
2014-03-08 07:39:34 -06:00
Markus Amalthea Magnuson
3f681ebc52 Touch up documentation strings for DigitalOcean. 2014-03-08 12:40:45 +01:00
Dolph Mathews
8808e029f9 spelling correction for "separate"
s/seperate/separate/

http://en.wiktionary.org/wiki/separate
2014-03-08 04:51:34 -06:00
Michael DeHaan
8388ce626f Merge pull request #6326 from karelstriegel/patch-1
Update intro_adhoc.rst
2014-03-07 20:43:23 -06:00
Michael DeHaan
d2cb35f898 Merge pull request #6320 from angstwad/instance-redo
Use isinstance() rather than a check using type()
2014-03-07 20:41:33 -06:00
Richard Isaacson
9eb47bfd7c Merge pull request #6338 from risaacson/issues_5354
unarchive module: Add creates functionality.
2014-03-07 18:23:22 -06:00
Richard C Isaacson
a483e42583 unarchive module: Add creates functionality.
Closes GH-5354.

Forklift copy logic into unarchive. Provides integration unit tests.
2014-03-07 18:19:46 -06:00
James Cammarata
4753804ab4 Merge pull request #6332 from jimi-c/issue_6329_space_in_var
Correctly catch template errors without returning invalid data
2014-03-07 17:38:47 -05:00
James Cammarata
e3b887f770 Fix range issue in inventory and add additional error checking
Fixes #6331
2014-03-07 16:34:04 -06:00
Richard Isaacson
d3cbde57f5 Merge pull request #6334 from risaacson/pull_6033
Yum: Fix logic in yum.
2014-03-07 15:24:32 -06:00
Richard C Isaacson
d6247a3583 Yum: Fix logic in yum. 2014-03-07 15:22:59 -06:00
Richard Isaacson
194f270a92 Merge pull request #6333 from risaacson/pull_6033
Merge pull_6033.
2014-03-07 15:14:21 -06:00
Richard C Isaacson
47b2dc611c Look at the filename and if it has a version defined possibly process this as a downgrade. 2014-03-07 15:01:39 -06:00
James Cammarata
3cd7d47b7e Correctly catch template errors without returning invalid data
Fixes #6329
2014-03-07 14:36:54 -06:00
Richard C Isaacson
9244283122 Spelling and formatting. 2014-03-07 13:53:31 -06:00
Cove Schneider
29f1528492 change order of copyright 2014-03-07 11:08:08 -06:00
Cove Schneider
f47fe7af62 add sponsor copyright/attribution 2014-03-07 11:07:48 -06:00
Cove Schneider
cbd1da6457 add yum module downgrade support 2014-03-07 11:07:18 -06:00
Richard Isaacson
9a06292a52 Merge pull request #6328 from lathan/patch-1
english syntax fix
2014-03-07 09:55:33 -06:00
James Laska
c7d1c1a306 [test_service] correct upstart service name and permissions
The 'service' utility was unable to find the 'ansible_test' service due to an
unexpected filename.  This patch corrects the filename and adjusts the
permissions to match other service scripts within /etc/init/.
2014-03-07 10:42:13 -05:00
George Angelopoulos
e846b4c619 english syntax fix
remove redundant 'are'
2014-03-07 14:36:46 +02:00
karelstriegel
2cf3a7f7be Update intro_adhoc.rst
Small grammar fix
2014-03-07 10:34:44 +01:00
James Cammarata
f80d02d841 Properly wrap logical elements together for su/sudo detection 2014-03-07 00:07:10 -06:00
James Cammarata
b6056044b7 Partial revert of 73c883c due to issues with handlers in roles
Fixes #6322
2014-03-06 21:13:40 -06:00
Michael DeHaan
e486dbab04 Use the loaded variable since we have it assigned, not just for error detection. 2014-03-06 22:15:21 -05:00
Michael DeHaan
3f07ec3d73 Fixup JSON error reporting in previous commits. 2014-03-06 22:07:35 -05:00
Michael DeHaan
a4d01b0891 Also search .json filenames 2014-03-06 21:47:49 -05:00
Michael DeHaan
79799f6819 Allow any file that can be in YAML to also be in JSON. This is primarily done to support non-visual editors better. 2014-03-06 21:42:51 -05:00
Scott Anderson
db67c3d772 Fixes a bug that prevents round-tripping of * and @ 2014-03-06 19:10:56 -05:00
James Cammarata
a0f939581d Merge branch 'aresch-devel' into devel 2014-03-06 16:47:06 -06:00
Paul Durivage
3cce3650e5 Use isinstance() rather than a check using type() 2014-03-06 16:16:25 -06:00
Richard Isaacson
119434d079 Merge pull request #6319 from risaacson/fix_test_dir_inventory
Fix TestInventory Unit Tests

Tested clean.
2014-03-06 15:43:45 -06:00
James Cammarata
9b79591f23 Merge branch 'devel' of https://github.com/aresch/ansible into aresch-devel 2014-03-06 15:17:55 -06:00
James Laska
868746b095 Correct ansible_distribution typo
Redhat != RedHat
2014-03-06 16:16:00 -05:00
James Laska
ba9950a73a Use correct value of ansible_distribution in integration tests
This fixes integration tests when run on a RHEL system.  Oddly, the
ansible_distribution='RedHat' when run on RHEL.
2014-03-06 15:52:15 -05:00
James Cammarata
5a235f9e99 Merge pull request #6318 from jimi-c/issue_5305_ec2_elb_None_issue
Adding a wait loop to ec2_elb for the initial lb state when registering
2014-03-06 14:01:11 -06:00
James Tanner
85bc14a8eb Remve debug file from vault unit test 2014-03-06 14:49:55 -05:00