projects
/
awsible
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
61529b7
)
do dependant infrastructure tasks on non-root localhost
author
Justin Wind
<j.wind@partner.samsung.com>
Mon, 13 Mar 2017 17:10:31 +0000
(10:10 -0700)
committer
Justin Wind
<j.wind@partner.samsung.com>
Mon, 13 Mar 2017 17:10:31 +0000
(10:10 -0700)
roles/aws-management-infrastructure/defaults/main.yml
patch
|
blob
|
history
roles/aws-vpc-infrastructure/tasks/main.yml
patch
|
blob
|
history
roles/aws-vpc/tasks/main.yml
patch
|
blob
|
history
roles/common-infrastructure/tasks/main.yml
patch
|
blob
|
history
diff --git
a/roles/aws-management-infrastructure/defaults/main.yml
b/roles/aws-management-infrastructure/defaults/main.yml
index 1830f02f10315c8d6899ef437e1734281f669fa8..0db972b3aeb5398c320272412a1db0e01292d855 100644
(file)
--- a/
roles/aws-management-infrastructure/defaults/main.yml
+++ b/
roles/aws-management-infrastructure/defaults/main.yml
@@
-4,4
+4,3
@@
MANAGEMENT_EVENT_QUEUE_SHORT: management
MANAGEMENT_EVENT_FAILURE_QUEUE: "{{ MANAGEMENT_EVENT_QUEUE }}-failed"
MANAGEMENT_NOTICE_TOPIC: management-notifications
MANAGEMENT_NOTICE_TOPIC_SHORT: notices
MANAGEMENT_EVENT_FAILURE_QUEUE: "{{ MANAGEMENT_EVENT_QUEUE }}-failed"
MANAGEMENT_NOTICE_TOPIC: management-notifications
MANAGEMENT_NOTICE_TOPIC_SHORT: notices
-MANAGEMENT_KEY_NAME: management
\ No newline at end of file
diff --git
a/roles/aws-vpc-infrastructure/tasks/main.yml
b/roles/aws-vpc-infrastructure/tasks/main.yml
index af68180f18e9682b709f253093a784e63b871b39..17a5800252191c1824bf434c53d3cf09ad2b0441 100644
(file)
--- a/
roles/aws-vpc-infrastructure/tasks/main.yml
+++ b/
roles/aws-vpc-infrastructure/tasks/main.yml
@@
-31,12
+31,12
@@
az: "{{ item.az }}"
tags: "{{ item.resource_tags }}"
az: "{{ item.az }}"
tags: "{{ item.resource_tags }}"
-- name: Access/NAT EIP
- ec2_eip:
- in_vpc: yes
- region: "{{ vpc_region }}"
- reuse_existing_ip_allowed: yes
- register: access_eip
+
#
- name: Access/NAT EIP
+
#
ec2_eip:
+
#
in_vpc: yes
+
#
region: "{{ vpc_region }}"
+
#
reuse_existing_ip_allowed: yes
+
#
register: access_eip
# As of ansible 2.2.1.0, it cannot set anything on the main route table
# due to limitations of the underlying boto libarary.
# As of ansible 2.2.1.0, it cannot set anything on the main route table
# due to limitations of the underlying boto libarary.
diff --git
a/roles/aws-vpc/tasks/main.yml
b/roles/aws-vpc/tasks/main.yml
index e92a53aeafc513da275623eff79089de8485a154..da1f4f54ad3b3625a22f022b4e044d7ff1c7631f 100644
(file)
--- a/
roles/aws-vpc/tasks/main.yml
+++ b/
roles/aws-vpc/tasks/main.yml
@@
-7,6
+7,8
@@
tags: ['check_vars']
- name: VPC
tags: ['check_vars']
- name: VPC
+ delegate_to: localhost
+ become: no
ec2_vpc_net:
state: present
name: "{{ vpc_name }}"
ec2_vpc_net:
state: present
name: "{{ vpc_name }}"
diff --git
a/roles/common-infrastructure/tasks/main.yml
b/roles/common-infrastructure/tasks/main.yml
index 6d40a647d3d161f58b18dc4eaea3eb7041db05c9..0d3910b836b14ae59f4f37df2818a31a85202dc8 100644
(file)
--- a/
roles/common-infrastructure/tasks/main.yml
+++ b/
roles/common-infrastructure/tasks/main.yml
@@
-1,5
+1,7
@@
---
- name: sg ssh
---
- name: sg ssh
+ delegate_to: localhost
+ become: no
ec2_group:
vpc_id: "{{ vpc.vpc.id }}"
region: "{{ vpc_region }}"
ec2_group:
vpc_id: "{{ vpc.vpc.id }}"
region: "{{ vpc_region }}"