Commit graph

5784 commits

Author SHA1 Message Date
Brian Coca
e8f56bb627 Merge pull request #1027 from apollo13/patch-1
Added os.path.expanduser when searching for pip executable.
2015-03-29 16:14:00 -04:00
Florian Apolloner
afd0b3fcaa Added os.path.expanduser to app_path in django_manage 2015-03-29 21:34:29 +02:00
Florian Apolloner
7f4f89abda Added os.path.expanduser when searching for pip executable. 2015-03-29 21:06:36 +02:00
Brian Coca
adfcfa4b58 Merge pull request #318 from preo/ec2-group-empty-rules
Allow empty EC2 Security Group rules.
2015-03-29 10:26:33 -04:00
Brian Coca
feb5144c71 Merge pull request #1021 from defionscode/s3_conn
allow boto profile use with s3
2015-03-29 10:08:54 -04:00
Brian Coca
44a9c7ad31 Merge pull request #266 from yosida95/fakes3s
support secure connection on fakes3
2015-03-29 10:03:04 -04:00
Kohei YOSHIDA
8ab812c242 support secure connection on fakes3 2015-03-28 23:31:53 +09:00
Jonathan Davila
611165a77e allow boto profile use with s3 2015-03-28 10:17:12 -04:00
Brian Coca
1c5cef0ee9 Merge pull request #1019 from rtrauntvein/patch-1
Specify that "state: reloaded" was added in Ansible 1.9
2015-03-27 20:18:25 -04:00
Ryan Trauntvein
5320cc93e6 Specify that "state: reloaded" was added in Ansible 1.9 2015-03-27 16:36:10 -07:00
Brian Coca
bbf2ec2501 Merge pull request #1018 from smiller171/devel
describe choices in alias documentation
2015-03-27 17:37:46 -04:00
Scott Miller
13d420ebee describe choices in alias documentation 2015-03-27 16:20:20 -04:00
Brian Coca
f3e4704d92 Merge pull request #569 from 47lining/rate-throttling-retries-update
add retry with exponential backoff when we receive throttling error code...
2015-03-27 08:21:09 -04:00
Brian Coca
aeb264f581 Merge pull request #566 from 47lining/cloud_modules_sts_support_redux
Cloud Modules STS Support Redux
2015-03-27 08:20:53 -04:00
Mick Bass
a01a0ed364 resolve merge conflicts 2015-03-26 22:54:08 -06:00
Mick Bass
64a2077787 Add support for AWS Security Token Service (temporary credentials) to all AWS cloud modules. 2015-03-26 22:44:56 -06:00
Brian Coca
eacf4e4239 Merge pull request #269 from SDFE/rds_subnet_group_params
use aws connect call in rds_subnet_group that allows boto profile use
2015-03-26 15:53:33 -04:00
Toshio Kuratomi
7e7eafb3e3 Make lack of boto call fail_json instead of sys.exit
Fixes #994
2015-03-26 12:12:39 -07:00
Brian Coca
5d776936cc Merge pull request #256 from SDFE/route53_connect_params
Use aws connect calls that allow boto profile use
2015-03-26 14:34:24 -04:00
Brian Coca
68daec05f2 Merge pull request #254 from SDFE/ec2_vpc_connect_params
use simpler ec2_connect ec2 util call
2015-03-26 14:17:27 -04:00
Brian Coca
a49c4e3919 Merge pull request #144 from quodlibetor/add-elasticache-cache_subnet_group_name
Add `cache_subnet_group_name` to elasticache module
2015-03-26 14:16:26 -04:00
Brandon W Maister
efa4d04284 Make cache_subnet_group default to empty security groups
Since they can't be specified together, it seems like setting the
default to no security groups is the right option.
2015-03-26 13:56:46 -04:00
Brandon W Maister
3cb2346312 Add cache_subnet_group to elasticache module
According to the [docs] cache subnet groups are required inside a VPC.

[docs]: http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheSubnetGroups.html
2015-03-26 13:56:46 -04:00
Brian Coca
0771dd12ca Merge pull request #1004 from bcoca/s3_fixes
S3 fixes
2015-03-26 12:39:36 -04:00
Brian Coca
e5ed49d6c7 added patch to workaround some s3 connection faliures 2015-03-26 11:23:32 -04:00
Brian Coca
f6c9d555a0 Merge pull request #976 from jsmartin/asg_doc_fix
Re-wording of feature.
2015-03-25 22:12:35 -04:00
Brian Coca
6570d48657 refactrored connection exception handling, added check to see if we actually get a connection before proceeding
Fixes #964
2015-03-25 21:40:13 -04:00
Brian Coca
79844506db Merge pull request #341 from axilleas/digitalocean_docs
digital_ocean: Add note about using API v1
2015-03-25 15:16:03 -04:00
Toshio Kuratomi
515cd6666d Fix stat code to return name of group owning the file rather than name of group that the file's owner belongs to.
Followup to #17
2015-03-25 08:33:19 -07:00
Toshio Kuratomi
9464277f4f Merge pull request #993 from smashwilson/docker-deployed-by-image
[docker] Compare container's configured image instead of running image
2015-03-24 12:55:33 -07:00
Ash Wilson
9ce2fc718a Only fetch details when necessary. 2015-03-24 11:18:15 -04:00
Ash Wilson
47f4c3f2e5 Compare container images to Config.Image. 2015-03-24 11:07:12 -04:00
Brian Coca
9763268903 Merge pull request #991 from sairez/devel
fix syntax in last EC2 ELB LB example
2015-03-24 10:47:19 -04:00
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
James Martin
3bd2b7c8aa Re-wording of feature. 2015-03-20 14:59:34 -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