cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5743 commits 47 branches 390 tags 440 MiB
Commit graph

5743 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sarah Zelechoski
43cd4ebd2e fix syntax in last example 2015-03-24 10:31:34 -04:00
Brian Coca
d8ab661d0a Merge pull request #983 from ssssam/sam/authorized-keys-crash-fix 
Fix authorized_key module crashing when given an invalid key
 2015-03-23 10:19:24 -04:00
Sam Thursfield
60397fae0f Fix authorized_key module crashing when given an invalid key 
I tried a playbook with the following (accidentally wrong) task:

  tasks:
      - name: authorized key test
        authorized_key: key=/home/sam/.ssh/id_rsa.pub key_options='command="/foo/bar"' user=sam

I got the following traceback:

    TASK: [authorized key test] ***************************************************
    failed: [localhost] => {"failed": true, "parsed": false}
    Traceback (most recent call last):
    File "/home/sam/.ansible/tmp/ansible-tmp-1427110003.65-277897441194582/authorized_key", line 2515, in <module>
        main()
    File "/home/sam/.ansible/tmp/ansible-tmp-1427110003.65-277897441194582/authorized_key", line 460, in main
        results = enforce_state(module, module.params)
    File "/home/sam/.ansible/tmp/ansible-tmp-1427110003.65-277897441194582/authorized_key", line 385, in enforce_state
        parsed_new_key = (parsed_new_key[0], parsed_new_key[1], parsed_options, parsed_new_key[3])
    TypeError: 'NoneType' object has no attribute '__getitem__'

With this fix, I see the expected error instead:

    TASK: [authorized key test] ***************************************************
    failed: [localhost] => {"failed": true}
    msg: invalid key specified: /home/sam/.ssh/id_rsa.pub
 2015-03-23 11:51:49 +00:00
Toshio Kuratomi
bad542025d Merge pull request #972 from caphrim007/include-apt-debfile-after-installing-python-apt 
Add missing import of apt.debfile
 2015-03-20 14:42:00 -07:00
Brian Coca
7683f36613 fix to return vals docs 2015-03-20 17:00:55 -04:00
Toshio Kuratomi
0101904da5 Merge pull request #975 from ansible/m-o-e-fix-ec2_asg 
Fixes to broken tag handling in ec2_asg
 2015-03-20 11:35:52 -07:00
Toshio Kuratomi
5399f3744f Fix review comments from @bcoca in #745 2015-03-20 09:52:19 -07:00
Toshio Kuratomi
9e9fa6a451 Merge branch 'fix-ec2_asg' of https://github.com/m-o-e/ansible-modules-core into m-o-e-fix-ec2_asg 2015-03-20 09:43:05 -07:00
Toshio Kuratomi
a78de50801 Minor code formatting 2015-03-19 22:38:06 -07:00
Rowan Wookey
37412219d5 Fixed group name not being passed to wait_for_new_instances when replacing instances 
Fixed group_name not being passed to wait_for_elb
Minor code clean up
 2015-03-19 22:38:06 -07:00
James Martin
1c96ff32a1 check lb for instance healthy and some refactoring of rolling replace functions. 
Optionally waiting for new instances to be in viable state on ASG creation/update.

Properly updating properties and terminating group.
 2015-03-19 22:38:06 -07:00
Tim Rupp
dba0023940 Add missing import of apt.debfile 
In cases when the python-apt package is not installed, ansible will
attempt to install it. After this attempt, it tries to import the
needed apt modules, but forgets to import the apt.debfile module.

The result is that playbooks that use the dpkg argument on a machine
that does not initially have the python-apt package available will
fail with the following error

AttributeError: 'module' object has no attribute 'debfile'

This patch adds the appropriate import to the apt module to ensure
that necessary libraries are available in cases when the dpkg argument
is being used on a system that does not initially have the python-apt
package installed
 2015-03-19 14:54:59 -07:00
Toshio Kuratomi
fb1c92ffa4 Merge pull request #724 from ferrants/devel-metric_alarm_fix 
check keys is in dim2 before evaluating
 2015-03-19 12:46:43 -07:00
Brian Coca
a97bc22103 Merge pull request #971 from bcoca/undep_os 
undeprecated openstack modules as new ones are not making into release
 2015-03-19 15:16:38 -04:00
Brian Coca
5641b1ff73 undeprecated openstack modules as new ones are not making into release 2015-03-19 15:15:17 -04:00
Brian Coca
6e273e50a1 Merge pull request #969 from moncho/patch-1 
Fix typo that prevents use_tls 'encrypt' option from working properly.
 2015-03-19 14:37:00 -04:00
moncho
3421712e05 Update docker.py 
Fix typo that prevents use_tls 'encrypt' option from working properly.
 2015-03-19 19:30:36 +01:00
Brian Coca
42d91951cf Merge pull request #537 from zitterbacke/patch-2 
fix uri modul for JSON-escape quotation marks
should fix #121
 2015-03-19 09:12:29 -04:00
Eric Johnson
c7381a92b8 Merge pull request #956 from rmarsagoogle/gce_net 
Added multiple allowed ranges.
 2015-03-19 06:09:18 -07:00
Toshio Kuratomi
76198a8223 Merge pull request #961 from nemunaire/fix-docker-version-print 
[docker] Fix formating error when remote host doesn't have required version
 2015-03-18 19:51:45 -07:00
Toshio Kuratomi
e338fef730 Add another valid status from downloading images 2015-03-18 18:27:01 -07:00
nemunaire
fce8c21176 Convert tuple items to string before format 2015-03-18 14:37:26 +01:00
Robert Marsa
74e94f2712 Added multiple allowed ranges. 2015-03-17 13:49:53 -07:00
Toshio Kuratomi
ae253593e3 Merge pull request #955 from Seraf/devel 
Fix the issue #931: ec2_asg : can't set desired_capacity to 0
 2015-03-17 10:57:50 -07:00
Julien Syx
23fdba26b5 Fix the issue #931 
Checking that the parameter doesn't exist. The old code had a bug when the parameter was 0.
 2015-03-17 17:57:18 +01:00
Toshio Kuratomi
8658b82de7 Some code cleanup (removed unused variables and imports) 2015-03-16 11:58:03 -07:00
Toshio Kuratomi
34c4e0d495 Also use DOCKER_TLS_VERIFY env var to turn on tls verification 2015-03-16 11:43:52 -07:00
Toshio Kuratomi
ceda82603a Merge pull request #947 from ansible/docker-tls-none 
When no use_tls is not specified and no tls parameters are given we need to not attempt tls.
 2015-03-16 11:29:14 -07:00
Toshio Kuratomi
b0d194ea94 Fix a potential bug in docker pull 2015-03-15 11:22:07 -07:00
Toshio Kuratomi
d65d04b3f8 Merge pull request #904 from ansible/ec2_vpc-sort 
Sort subnets by the order they are specified in the play
 2015-03-15 11:19:07 -07:00
Toshio Kuratomi
5b4d7a2182 When no use_tls is not specified and no tls parameters are given we need to not attempt tls. 2015-03-14 22:59:17 -07:00
Toshio Kuratomi
b530afc24e Merge pull request #943 from rowleyaj/patch-1 
cloud/amazon/s3: update documentation
 2015-03-14 07:38:23 -07:00
Alex Rowley
7d6cd3baaa cloud/amazon/s3: update documentation 
update description to show that module can do more than just put files into s3
 2015-03-13 21:08:30 +00:00
Toshio Kuratomi
e44ee190d2 Merge branch 'lorin-volumes_from' into devel 2015-03-13 13:44:31 -07:00
Toshio Kuratomi
45637176dc Merge branch 'volumes_from' of https://github.com/lorin/ansible-modules-core into lorin-volumes_from 
Remove volumes_from altogether

Conflicts:
	cloud/docker/docker.py
 2015-03-13 13:42:40 -07:00
Toshio Kuratomi
e4a5b46cfb Merge pull request #936 from ansible/docker-pid-mode 
Make pid_mode parameter do minimum docker-py/docker server version checks
 2015-03-13 11:50:46 -07:00
Toshio Kuratomi
138bc239f9 Merge pull request #941 from ansible/docker-alias-running 
Make state=running work for backwards compatibility with 1.8
 2015-03-13 10:37:47 -07:00
Toshio Kuratomi
81fc92bd66 Make state=running work for backwards compatibility with 1.8 2015-03-13 10:23:10 -07:00
Toshio Kuratomi
bddd02bfcb Fix lookup of parameter name to be pid instead of pid_mode 2015-03-13 07:31:55 -07:00
Toshio Kuratomi
9d0d54b9a6 Merge pull request #926 from ansible/docker-tls-alt-854 
Alternative implementation of tls for docker
 2015-03-12 23:41:28 -07:00
Toshio Kuratomi
cf9374f3ea Make pid_mode parameter do minimum docker-py/docker server version checks 2015-03-12 22:53:31 -07:00
Toshio Kuratomi
3a6cc86578 Fix for problems found by @dguerri 
* TLSConfig['verify'] has to be set to False if we're only encrypting the
  connection, not verifying the host.
* tls_hostname was not set if tls_ca_cert was not present

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78573877
 2015-03-12 12:53:48 -07:00
Toshio Kuratomi
1add8ed9e5 Implement comments from @smashwilson: 
* if tls_ca_cert is set then use tls to verify the server
* take tls_hostname from the environment variable DOCKER_TLS_HOSTNAME
  if it's not specified in the playbook

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78542210
 2015-03-12 11:07:22 -07:00
Brian Coca
dfb58517fa Merge pull request #925 from InAnimaTe/patch-1 
Setting the actual passno and dump defaults, and warning user of consequ...
 2015-03-12 12:52:52 -04:00
Toshio Kuratomi
54fd95288e Merge pull request #927 from bobrik/fix-undefined-e 
[docker] fixed: global name 'e' is not defined
 2015-03-12 08:19:10 -07:00
Ian Babrou
763f472f5b fixed: global name 'e' is not defined 2015-03-12 11:04:50 +03:00
Toshio Kuratomi
3e0cbc82f1 Alternative implementation of tls for docker 
Alternative to #854
 2015-03-11 20:37:27 -07:00
Toshio Kuratomi
31cc5f543f Fix for py2.6 (no dict comprehensions on py2.6) 2015-03-11 19:07:55 -07:00
Toshio Kuratomi
8ed415589a Initialize the value of vpc_id variable 2015-03-11 18:40:05 -07:00
Mario Loria
30be06c971 Setting the actual passno and dump defaults, and warning user of consequences in nulling 
Using ansible 1.8.4, I found that these two options actually work slightly different than advertised.
 2015-03-11 21:36:44 -04:00