Merge pull request #3342 from edx/jibsheet/upgrade-ansible-ec2-modules

Pull down ec2 and route53 from ansible 2 for assume role support

playbooks/library/ec2_ami_2_0_0_1.py

-#!/usr/bin/python
+#!/usr/bin/env python
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify
@@ -402,4 +402,4 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+main()
\ No newline at end of file

playbooks/library/ec2_lookup

-#!/usr/bin/python
+#!/usr/bin/env python
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify

playbooks/library/ec2_tag_local

-#!/usr/bin/python
+#!/usr/bin/env python
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify

playbooks/library/ec2_vpc_local

-#!/usr/bin/python
+#!/usr/bin/env python
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify

playbooks/roles/launch_ec2/tasks/main.yml

@@ -18,7 +18,7 @@
 
 - name: terminating single instance
   local_action:
-    module: ec2
+    module: ec2_2_1_1_0
     state: 'absent'
     region: "{{ region }}"
     instance_ids: "{{tag_lookup.instance_ids}}"
@@ -36,7 +36,7 @@
 
 - name: Launch ec2 instance
   local_action:
-    module: ec2
+    module: ec2_2_1_1_0
     keypair: "{{ keypair }}"
     group: "{{ security_group }}"
     instance_type: "{{ instance_type }}"
@@ -56,7 +56,7 @@
 
 - name: Add DNS name
   local_action:
-    module: route53
+    module: route53_2_1_1_0
     overwrite: yes
     command: create
     zone: "{{ dns_zone }}"
@@ -68,7 +68,7 @@
 
 - name: Add DNS names for services
   local_action:
-    module: route53
+    module: route53_2_1_1_0
     overwrite: yes
     command: create
     zone: "{{ dns_zone }}"

requirements.txt

@@ -2,7 +2,7 @@ git+https://github.com/edx/ansible.git@stable-1.9.3-rc1-edx#egg=ansible==1.9.3-e
 PyYAML==3.11
 Jinja2==2.8
 MarkupSafe==0.23
-boto==2.32.1
+boto==2.33.0
 ecdsa==0.11
 paramiko==1.15.1
 pycrypto==2.6.1