James Cammarata
88acb48e61
Merge branch 'ec2_boto_config_region' of https://github.com/willthames/ansible into willthames-ec2_boto_config_region
2014-02-26 15:32:05 -06:00
James Cammarata
2a383786dd
And remove the expanduser calls from the action_plugin
2014-02-26 15:29:00 -06:00
Richard C Isaacson
585766201d
When looking for double colon len(line) is longer then 1.
...
Addresses GH-5116.
It comes up that when parsing json that if you are missing the last double quote on the last variable and the next line is just '}' we will get an out of range error. In this instance we will also then make sure that the line is long enough to have two colons.
2014-02-26 14:25:56 -06:00
James Cammarata
b758ed9417
Merge pull request #6150 from hkariti/fix_join_bug
...
Fix incorrect use of .join on list causing a traceback
2014-02-26 12:50:07 -06:00
James Cammarata
96f1c3ce2e
Move where the expanduser call is made, to avoid issues with None
2014-02-26 12:33:17 -06:00
James Cammarata
e659d55d62
Merge branch 'devel' of https://github.com/muffl0n/ansible into muffl0n-devel
2014-02-26 12:28:26 -06:00
James Cammarata
5ff20c1ae7
Merge branch 'scottanderson42-ec2-params' into devel
2014-02-26 11:38:36 -06:00
James Tanner
baed7a0ed9
Fixes #6187 Add unit tests for VaultLib
2014-02-26 12:10:09 -05:00
Michael DeHaan
33857855ad
removing some unusued files. Paramiko alt was an experiment to attempt pipeline for paramiko, ssh_old is the non-pipelining-supported earlier
...
version of the OpenSSH transport, which is configurable now and unified.
2014-02-26 11:26:52 -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 Cammarata
8a7c68dc18
Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params
...
Conflicts:
lib/ansible/module_utils/ec2.py
library/cloud/ec2
2014-02-26 09:37:26 -06:00
Richard C Isaacson
af616fe15e
Rename flatten funciton.
...
flatten(x) is used a lot in the various lookup plugins where in each it is slightly different. This is to make this name slightly more unique.
2014-02-25 14:59:06 -06:00
Kent R. Spillner
1fcc9ff666
lookup_plugins: loop over hashes
...
Create a lookup plugin named dict that can be used to loop over hashes.
It converts a dict into a list of key-value pairs, with attributes named
"key" and "value." Also adds a brief explanation and simple example to
the docs.
Signed-off-by: Kent R. Spillner <kspillner@acm.org>
2014-02-25 11:20:15 -06:00
James Tanner
876035c0b1
Fixes #6161 Get the delegate host info properly from the hostvars object
2014-02-25 11:18:06 -05:00
James Tanner
9209581565
Fixes #6155 Inject checkmode into synchronize module args
2014-02-25 08:58:58 -05:00
James Cammarata
a18f811b2d
Merge branch 'jimi-c-issue_4620' into devel
2014-02-24 21:38:55 -06:00
James Cammarata
f23ccebbdc
Merge branch 'issue_4620' of https://github.com/jimi-c/ansible into jimi-c-issue_4620
2014-02-24 20:30:25 -06:00
James Tanner
0f95a905d9
Fixes #5965 Ensure the inject for each item in a loop is un-altered
2014-02-24 20:54:26 -05:00
James Cammarata
3b2d409906
Fixing several bugs in assemble and updating tests
...
Bugfixes:
* the remote_src param was not being converted to a boolean correctly,
resulting in it never being used by the module as the default behavior
was remote_src=True (issue #5581 )
* the remote_src param was not listed in the generic file params, leading
to a failure when the above bug regarding remote_src was fixed
* the delimiter should always end with a newline to ensure that the file
fragments do not run together on one line
Fixes #5581
2014-02-24 14:27:23 -06:00
jctanner
8a253bf576
Merge pull request #6151 from jctanner/vault_rewrite
...
Vault rewrite, pass 1
2014-02-24 14:54:01 -05:00
jctanner
93c746db9c
Merge pull request #5651 from nikut/sshfix
...
allow ansible_ssh_private_key_file to be templated (thanks to benno)
2014-02-24 14:26:48 -05:00
James Tanner
9c9f15acb7
Fix decryption error
2014-02-24 13:20:27 -05:00
James Tanner
52a8efefba
Vault rewrite, pass 1
2014-02-24 13:09:36 -05:00
Hagai
ae9c0d87a9
Fix incorrect use of .join on list
2014-02-24 19:48:55 +02:00
Richard C Isaacson
8be8dbc9ed
Formatting cleanup.
2014-02-24 11:11:47 -06:00
Richard C Isaacson
aaf0a182e1
Merge remote-tracking branch 'jeromew/ansible_script_creates' into issues_4986
2014-02-24 10:16:39 -06:00
Michael DeHaan
9686695170
Assume empty files are unencrypted.
2014-02-21 21:06:04 -05:00
James Tanner
4af1d6098b
Fixes #5939 Allow for delegate hosts that are not in inventory
2014-02-21 15:54:09 -05:00
James Cammarata
fa1ab231c9
Fixing bug in which playbook vars were not merged properly
...
This occurred when a hash would be passed in via extra args and the
hash variable behavior was set to 'merge', which resulted in the
variable from extra args replacing the playbook variable.
2014-02-20 15:25:52 -05:00
Michael DeHaan
bc65956798
Add tests that leverage most of our custom filters. A few more to add.
2014-02-20 15:24:03 -05:00
James Cammarata
f5505425f9
Adding 'expanduser' filter to the core filters list
...
Example usage: {{ my_path | expanduser }} # my_path: "~/path/to/file"
2014-02-20 13:48:07 -05:00
James Cammarata
ef2df8157a
Fixup result dictionary when copy module calls file module
2014-02-19 18:05:59 -05:00
muffl0n
b0f00cc097
already call expanduser in action_plugin
2014-02-19 21:41:57 +01:00
muffl0n
5f0e882d01
call expanduser for src and dest
2014-02-19 21:30:53 +01:00
root
0df166e7c0
Copy tests WIP, fix bug in assert module upgrades where the wrong value was being checked.
2014-02-19 14:36:54 -05:00
James Cammarata
54117ab28f
Modified assert module to take tests as an array
2014-02-19 14:05:03 -05:00
James Tanner
bee089d5e1
Remove entropy comment
2014-02-19 13:36:20 -05:00
James Tanner
86b9f84fb9
Change entropy message for vault
2014-02-19 13:31:01 -05:00
Richard Isaacson
dc403eb21e
Merge pull request #6058 from jctanner/vault_squashed_2
...
Ansible vault: a framework for encrypting any playbook or var file.
2014-02-19 11:39:55 -05:00
James Tanner
3a965a1392
Remove intermediate string on decrypt
2014-02-19 11:35:00 -05:00
James Tanner
286ca505bd
Remove breakpoint
2014-02-19 11:08:02 -05:00
James Tanner
84467a8f12
Change retype to confirm
2014-02-19 11:06:53 -05:00
James Tanner
aa46ab1d86
Fix function name
2014-02-19 11:05:08 -05:00
James Tanner
3fc87e011b
Fix all other calls to yaml
2014-02-19 11:01:21 -05:00
James Cammarata
b6222abee6
Fix unicode decode error in syslog for modules
...
Fixes #6056
2014-02-19 09:42:01 -05:00
James Tanner
427b8dc78d
Ansible vault: a framework for encrypting any playbook or var file.
2014-02-18 15:35:12 -05:00
Richard C Isaacson
1ac19cb981
Copy action_plugin: encode content when dict.
...
When content is processed and found to be valid JSON it is decoded into a dict. To write it out to a file we need to encode it back into a string.
Addresses GH-5914.
2014-02-18 13:23:44 -06:00
James Cammarata
f29ce80d12
Default port to 22 for paramiko when it is unset
2014-02-18 09:53:24 -06:00
James Cammarata
92cbfff904
Merge branch 'sshdefault' of https://github.com/craigtracey/ansible into craigtracey-sshdefault
2014-02-18 09:44:19 -06:00
jeromew
7a14cb61c4
Add creates= and removes= to the script: action
2014-02-18 12:52:09 +00:00
