Commit graph

10819 commits

Author SHA1 Message Date
James Cammarata
3fb3e7e6dc Properly parse urls for ssh-keyscan use
Previously, the get_fqdn() function in known_hosts.py only worked
with urls that started with git@, and ignored any urls that started
with a normal schema type (ie. http:// or ssh://). This patch corrects
that by using urlparse to parse the hostname portion out of urls that
have a proper schema.

Fixes #7474
2014-06-12 16:16:42 -05:00
James Cammarata
ac349dce96 Fixing typo in integration Makefile from an earlier change 2014-06-12 13:14:01 -05:00
James Cammarata
12f7c9871e Merge pull request #7555 from icebourg/softlayer_inventory
SoftLayer Inventory script
2014-06-12 12:42:22 -05:00
James Cammarata
b174b1a536 Merge branch 'matlockx-devel' into devel 2014-06-12 10:26:39 -05:00
James Cammarata
1173a8d6af Catch error in azure related to a failed deployment when creating a vm 2014-06-12 10:25:31 -05:00
James Cammarata
0b8c8b0581 Merge branch 'devel' of https://github.com/matlockx/ansible into matlockx-devel 2014-06-12 09:32:03 -05:00
James Cammarata
8a1741e2d8 Merge branch 'ahtik-fix-lineinfile-eof-newline' into devel 2014-06-12 09:15:12 -05:00
James Cammarata
d90f0bdfad Merge branch 'fix-lineinfile-eof-newline' of https://github.com/ahtik/ansible into ahtik-fix-lineinfile-eof-newline 2014-06-12 09:13:49 -05:00
James Cammarata
db4a5c6046 Merge pull request #7741 from mgcrea/devel
Add support for Linaro distribution in hostname module
2014-06-12 08:58:56 -05:00
James Cammarata
395192ffbc Merge pull request #7740 from jkramarz/issue-5761
changed sector size fact source
2014-06-12 08:56:03 -05:00
James Cammarata
c548d0fb3b Merge pull request #7737 from toddmowen/zfs-fix-7696
zfs: fix incompatibility - share.nfs vs sharenfs (issue #7696)
2014-06-12 08:53:21 -05:00
James Cammarata
ac40465f80 Merge pull request #7734 from WyriHaximus/patch-1
Made it a bit more obvious that 45 are 45 seconds
2014-06-12 08:19:15 -05:00
James Cammarata
ccf47577c4 Merge branch 'sivel-rax-autoscale' into devel 2014-06-12 08:14:39 -05:00
James Cammarata
8151746bf3 Adding new rax_scaling* modules to the CHANGELOG 2014-06-12 08:00:33 -05:00
James Cammarata
b4d130d086 Add a new password pattern to the run_command filter 2014-06-12 07:42:25 -05:00
Jakub Kramarz
4e4c9235e8 changed sector size fact source from hw_sector_size to physical_block_size, fixes issue 5761 2014-06-12 12:14:40 +02:00
Olivier Louvignes
8051e12490 Add support for Linaro distribution in hostname module 2014-06-12 12:06:59 +02:00
Todd Owen
4230a9a462 zfs: work around incompatibility by renaming share.nfs to sharenfs
Fixes #7696
2014-06-12 16:21:16 +08:00
Cees-Jan Kiewiet
43d19218c3 Made it a bit more obvious that 45 are 45 seconds 2014-06-12 09:12:52 +02:00
James Cammarata
aaa74352a7 Merge pull request #7729 from rgbkrk/ufw_check_direction+interface
Error checking and reporting on interface ufw rule
2014-06-11 16:34:55 -05:00
James Cammarata
8ff046a0aa Merge pull request #7726 from ebastos/devel
Added quotes around key path - Issue 7713
2014-06-11 16:28:11 -05:00
rgbkrk
da107d3f0c Error checking and reporting on interface ufw rule 2014-06-11 11:10:38 -05:00
James Cammarata
4cbe4b9306 Merge pull request #7717 from Xerkus/patch-2
Escape backslash in assemble module docs
2014-06-11 07:19:27 -05:00
Eri Bastos
a65fd06338 Added quotes around key path - Issue 7713 2014-06-10 16:39:47 -03:00
Aleksey Khudyakov
6865ffe93c Escape backslash in assemble module docs 2014-06-11 04:38:57 +11:00
James Cammarata
50364bb079 Merge branch 'carlanton-pr_fix2' into devel 2014-06-10 10:10:37 -05:00
James Cammarata
96c6daf177 Change name of vault integration test 2014-06-10 10:07:50 -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
James Cammarata
550bef490e Back-porting 1.6.x release info into CHANGELOG/RELEASES and packaging 2014-06-10 10:02:58 -05:00
James Cammarata
917ad8da72 Merge pull request #7687 from ryanpetrello/devel
Fix neutron floating IP allocation for networks w/ multiple subnets
2014-06-10 09:42:34 -05:00
James Cammarata
07e10fb9ff Merge branch 'rax-autoscale' of https://github.com/sivel/ansible into sivel-rax-autoscale 2014-06-10 09:16:02 -05:00
James Cammarata
2240f8ef56 Merge pull request #7714 from pmyjavec/devel
Docker links need alias specified
2014-06-10 09:15:12 -05:00
James Cammarata
ae80c2061a Back-porting 1.6.x release info into CHANGELOG/RELEASES and packaging 2014-06-10 09:03:30 -05:00
Paul Myjavec
074a6f3e3e Docker links and required alias
If no alias is passed one will now be created for you with the same name
as the target link container, as per the documentation
2014-06-10 22:53:55 +10:00
James Cammarata
8e3b512293 Merge pull request #7377 from mikhailguru/devel
Fixed handling of paths containing whitespaces in the synchronize module
2014-06-10 06:50:07 -05:00
James Cammarata
0073b34653 Merge pull request #7259 from darKoram/nova_keypair_check_keys
nova_keypair should fail if 'name' of key exists in keystore, but ssh hash value != public_key offered
2014-06-09 23:53:22 -05:00
James Cammarata
150a2346c1 Merge pull request #7238 from willthames/ec2_snapshot_argument_spec
Improve the ec2_snapshot argument spec and docs
2014-06-09 23:51:42 -05:00
James Cammarata
e5ef0eca03 Merge pull request #6507 from brdo/patch-1
Set keepalive to 5 seconds in paramiko_ssh.py
2014-06-09 23:44:06 -05:00
James Cammarata
05fdd664fe Merge pull request #7707 from rrgomes/devel
Fix incorrect argument ordering in error message
2014-06-09 23:38:30 -05:00
James Cammarata
3fe7d53688 Merge pull request #7705 from smoothify/random-nocache
Ensure random jinja filter doesn't get cached in loops.
2014-06-09 23:35:46 -05:00
Ron Gomes
bcf3e29e14 Fix incorrect argument ordering in error message, which provokes a
printf-related TypeError.
2014-06-09 15:03:51 -04:00
smoothify
e3530dcbc2 Add environmentfilter to random filter, to ensure the result doesn't get cached. Mirrors default jinja filter. 2014-06-09 18:52:39 +01:00
Ahti Kitsik
1caf9be109 Bugfix to lineinfile to properly handle files with no newline at EOF when using insertafter=EOF.
Looks like #6881 is also affected by this bug.

Currently when using lineinfile insertafter=EOF for a file that has no newline then the added line is not prefixed with a newline.
As a concrete example, ubuntu distro default /etc/ssh/sshd_config has no newline so lineinfile module cannot be used to add a new line to the end of the file.
2014-06-09 19:58:45 +03:00
James Cammarata
2c9cba0631 Merge branch 'kcghost-7645' into devel 2014-06-09 10:49:58 -05:00
James Cammarata
61325f5817 Cleaning up svr4pkg commit fix for #7645 2014-06-09 10:48:06 -05:00
James Cammarata
19d6f4d177 Merge branch '7645' of https://github.com/kcghost/ansible into kcghost-7645 2014-06-09 10:45:29 -05:00
James Cammarata
989e4770d0 Merge pull request #7684 from JeanFred/patch-2
Fix documentation of deb option in apt module
2014-06-09 10:03:36 -05:00
Michael DeHaan
9de1e57ebb Merge pull request #7698 from gsker/patch-1
Update intro_installation.rst
2014-06-09 10:58:20 -04:00
James Cammarata
7ff3282e39 Merge pull request #7682 from sergevanginderachter/bigip_monitor_http_checkmode_fix
bigip_monitor bugfix for check mode
2014-06-09 09:39:33 -05:00
James Cammarata
4c30b3d68a Fixing mysql master replication boolean
Fixes #7528
2014-06-09 08:58:55 -05:00