Commit graph

11211 commits

Author SHA1 Message Date
James Cammarata
4fc8d4b6fe Merge pull request #7649 from sivel/vault-password-script
Allow --vault-password-file to work with a script as well as a flat file
2014-07-14 10:57:16 -05:00
James Cammarata
e3abaa30b6 Merge pull request #7650 from sivel/guide-rax-automation
Rax Guide: Add RackConnect and Managed Cloud automation check examples
2014-07-14 10:44:53 -05:00
James Cammarata
d52b50cb03 Merge pull request #7478 from sivel/rax-keypair-filepath
rax_keypair module: Allow public_key to be a path to a file
2014-07-14 10:41:38 -05:00
James Cammarata
8753849959 Merge pull request #7477 from sivel/rax-user-data
rax module: Support config_drive and user_data
2014-07-14 10:25:28 -05:00
James Cammarata
fc02a85018 Merge branch 'sergevanginderachter-vars4pb_basedir' into devel 2014-07-14 09:24:55 -05:00
Serge van Ginderachter
e8b45a9ef7 Invalidate host/group variables cache when loading
extra varsiables based on playbook basedir.
2014-07-14 15:21:33 +02:00
Serge van Ginderachter
d39ff55688 Fix logic bug when loading vars for a new playbook basedir. 2014-07-14 15:12:53 +02:00
James Cammarata
8a6cfa1a23 Merge pull request #8103 from Jmainguy/mysql_db_6214
mysql_db: Fix error message for #6214
2014-07-11 14:47:03 -05:00
James Cammarata
fe3f6b3253 Merge pull request #8104 from AdmiralNemo/patch-1
Correct regex in is_keyid
2014-07-11 14:30:35 -05:00
James Cammarata
aa08368b8f Merge pull request #8094 from ghjm/vsphere-fixes
Fixed tracebacks during VM creation. Fixes #8067.
2014-07-11 14:22:53 -05:00
Dustin C. Hatch
dc304e6488 Correct regex in is_keyid
The `rpm_key` module claims to take a key ID as an argument, however it fails if one is actually given:

    msg: Not a valid key DEADBEEF

The reason for this is the regular expression in the `RpmKey.is_keyid` method is incorrect; it will only match the literal string "0-9a-f" exactly 8 times, rather than exactly 8 characters in the set 0-9 or a-f.
2014-07-11 14:02:25 -05:00
Jonathan Mainguy
40ef07a286 Errors out with stderr 1049, unknown database: when importing a database that does not exist 2014-07-11 14:57:45 -04:00
James Cammarata
db96344966 Re-fixing ability to have empty json files after inventory refactoring 2014-07-11 13:20:00 -05:00
James Cammarata
5e0d07c93e Merge pull request #8092 from ghjm/mysql-exceptions
Added exception handling to database creation and deletion. Fixes #8075.
2014-07-11 11:59:12 -05:00
James Cammarata
9dc1931576 Merge pull request #8093 from ghjm/mysql-dbname
Switched primary and alias names of the name/db parameter. Fixes #8065.
2014-07-11 11:57:20 -05:00
Michael DeHaan
fbdb10d8a5 Documentation simplification for git module parameter 2014-07-11 08:44:29 -04:00
Graham Mainwaring
fb83bdffa8 Fixed tracebacks when datacenter not found, when notes not given, and when collecting facts after VM creation. Fixes #8067. 2014-07-10 23:05:23 -04:00
Graham Mainwaring
22390e50e5 Switched primary and alias names of the name/db parameter, to match documentation. Fixes #8065. 2014-07-10 22:37:46 -04:00
Graham Mainwaring
980d9da7e9 Added exception handling to database creation and deletion. Fixes #8075. 2014-07-10 22:28:56 -04:00
James Cammarata
a320c02c81 Correcting var blending integration test 2014-07-10 15:54:38 -05:00
Michael DeHaan
fa2abe3816 Merge pull request #8089 from ssalevan/ssalevan/add-collins-inventory
Adding a Collins inventory script for Ansible
2014-07-10 16:19:41 -04:00
Steve Salevan
96e815d2b9 Don't write to cache if queries fail 2014-07-10 15:58:44 -04:00
Steve Salevan
71c46efe80 Moving to_safe back into class for consistency purposes 2014-07-10 15:58:44 -04:00
Steve Salevan
e621b3a8cc Adding a Collins inventory script for Ansible 2014-07-10 15:58:44 -04:00
James Cammarata
4e5eb7559e Merge branch 'svg_and_inventory_refactor' into devel 2014-07-10 14:43:07 -05:00
James Cammarata
6d24f43760 Updating google scripts for the docsite 2014-07-10 14:07:55 -05:00
James Cammarata
c96b2ae391 Merge pull request #8080 from ciupicri/service
Remove unused code
2014-07-10 12:27:53 -05:00
James Cammarata
2016406b12 Merge branch 'danslimmon-devel' into devel 2014-07-10 12:26:15 -05:00
James Cammarata
cf3c58d6ef Merge branch 'devel' of https://github.com/danslimmon/ansible into danslimmon-devel 2014-07-10 12:25:03 -05:00
James Cammarata
4d86bbe6dc Merge pull request #8086 from dataxu/dev-fix-typo
Bug Fix - fixed the choices typo got the ec2_asg module
2014-07-10 12:20:21 -05:00
James Cammarata
3a6d00f81d Add note about changing resource_tags to required in ec2_vpc 2014-07-10 12:18:35 -05:00
James Cammarata
2184b15542 Merge branch 'psa-resource-tag-required' into devel 2014-07-10 12:17:39 -05:00
Matt Ferrante
03fc2714f1 fixed the choices typo got the ec2_asg module 2014-07-10 11:01:19 -04:00
James Cammarata
9289076dc0 Merge branch 'hiciu-fix-7206' into devel 2014-07-10 08:54:30 -05:00
James Cammarata
3e7d91723f Adding version_added for new vm_hw_version field in vpshere_guest 2014-07-10 08:53:56 -05:00
James Cammarata
87d1cdd035 Merge branch 'fix-7206' of https://github.com/hiciu/ansible into hiciu-fix-7206 2014-07-10 08:19:05 -05:00
Dan Slimmon
6ad09f1825 Added test for regex grouping bug fixed in 307a3e 2014-07-10 00:21:38 +00:00
Dan Slimmon
307a3e8a9c Fixed regex square-bracket bug.
Regexes were being parsed like ordinary ansible host patterns, so
square-bracket groups were getting interpolated wrongly.
2014-07-10 00:08:12 +00:00
James Cammarata
dc89cc5f44 Merge pull request #8079 from Jmainguy/mysql_db_8070
Makes ansible fail if login_port is defined and login_host is either not...
2014-07-09 15:49:45 -05:00
Cristian Ciupitu
6a8bc42014 Remove useless code 2014-07-09 23:11:15 +03:00
Jonathan Mainguy
90f7f82224 Makes ansible fail if login_port is defined and login_host is either not defined, or defined as localhost. This is because if login_host is localhost then MySQLdb will use the socket instead of TCP. This leads to confusion for ansible users as, when a port is defined it gets ignored if login_host is localhost. This is to fix the bug reported by wrosario #8070. Info on MysqlDb can be read here http://mysql-python.sourceforge.net/MySQLdb.html 2014-07-09 14:38:27 -04:00
James Cammarata
56c94dc834 Merge branch 'mpeters-issue_7848' into devel 2014-07-09 12:36:25 -05:00
Michael DeHaan
caef3a0de2 Merge pull request #8010 from cchurch/ec2_all_instances
Add option to return all EC2/RDS instances regardless of state.
2014-07-09 13:32:32 -04:00
James Cammarata
0798f3cda4 Merge branch 'issue_7848' of https://github.com/mpeters/ansible into mpeters-issue_7848 2014-07-09 12:24:06 -05:00
James Cammarata
2efbdd2484 Merge branch 'mpeters-issue_7906' into devel 2014-07-09 12:22:20 -05:00
James Cammarata
26707568c7 Merge branch 'issue_7906' of https://github.com/mpeters/ansible into mpeters-issue_7906 2014-07-09 12:09:40 -05:00
James Cammarata
aecd292f13 Merge branch 'resource-tag-required' of https://github.com/psa/ansible into psa-resource-tag-required 2014-07-09 11:49:41 -05:00
James Cammarata
2c1e58b835 Merge branch 'ericwb-bug/8057' into devel 2014-07-08 14:40:19 -05:00
James Cammarata
06f72ca3b1 Merge branch 'bug/8057' of https://github.com/ericwb/ansible into ericwb-bug/8057 2014-07-08 14:38:35 -05:00
James Cammarata
33cfdc4cbf Merge branch 'darkk-assert-with-msg' into devel 2014-07-08 14:05:50 -05:00