Commit graph

5895 commits

Author SHA1 Message Date
Brian Coca
44a9c7ad31 Merge pull request #266 from yosida95/fakes3s
support secure connection on fakes3
2015-03-29 10:03:04 -04:00
Adam Chainz
8a4e7e5d9f Make cloudformation module's template argument not required in case of stack deletion 2015-03-29 09:31:13 +01: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
Lorin Hochstein
ea4d5798c7 Use the correct alias syntax 2015-03-28 09:31:52 -04:00
Lorin Hochstein
e759b4d0eb ec2 module: add instance_id alias
Create an alias named instance_id for the instance_ids parameter.
2015-03-28 09:31:52 -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
David Wittman
6d8437617c Set disabled repos before enabled repos
The ordering of disabling/enabling yum repositories matters, and
the yum module was mixing and matching the order. Specifically,
when yum-utils isn't installed, the codepath which uses the yum
python module was incorrectly ordering enabling and disabling.

The preferred order is to disable repositories and then enable them
to prevent clobbering. This was previously discussed in
ansible/ansible#5255 and incompletely addressed in 0cca4a3.
2015-03-27 11:07:51 -05: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
Sébastien Bocahu
6b20c3890f Add body_format for handling of JSON and YAML body
body_format is a new optional argument that enables handling of JSON or
YAML serialization format for the body argument.
When set to either 'json' or 'yaml', the body argument can be a dict or list.
The body will be encoded, and the Content-Type HTTP header will be set,
accordingly to the body_format argument.

Example:

- name: Facette - Create memory graph
  uri:
    method: POST
    url: http://facette/api/v1/library/graphs
    status_code: 201
    body_format: json
    body:
      name: "{{ ansible_fqdn }} - Memory usage"
      attributes:
        Source": "{{ ansible_fqdn }}"
        link: "1947a490-8ac6-4bf2-47c1-ff74272f8b32"
2015-03-27 11:11:25 +01: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
Richard Tier
04c1927300 allow setting header 2015-03-26 23:02:35 +00: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
Tor Åke Fransson
360409cee8 Merge remote-tracking branch 'origin/devel' into digitalocean-user-data
Conflicts:
	cloud/digital_ocean/digital_ocean.py
2015-03-26 14:05:57 +01:00
Tor Åke Fransson
3f17ec489b Remove all reference to obsolete client_id and rename api_key to the for v2 more correct api_token 2015-03-26 13:56:39 +01:00
Tor Åke Fransson
41875984e5 Make digital_ocean ssh command use API v2 2015-03-26 09:57:35 +01: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
David Wittman
8d53ef2f60 [service] Fix bug with upstart detection
Upstart scripts are being incorrectly identified as SysV init scripts
due to a logic error in the `service` module.

Because upstart uses multiple commands (`/sbin/start`, `/sbin/stop`,
etc.) for managing service state, the codepath for upstart sets
`self.svc_cmd` to an empty string on line 451.

Empty strings are considered a non-truthy value in Python, so
conditionals which are checking the state of `self.svc_cmd` should
explicitly compare it to `None` to avoid overlooking the fact that
the service may be controlled by an upstart script.
2015-03-25 17:37:18 -05: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
Tor Åke Fransson
69911ec86e WIP: DigitalOcean API version 2 with user_data option 2015-03-25 16:43:11 +01: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