From 1d6d8faca7fc54149228e3cfe851ecd0547368e5 Mon Sep 17 00:00:00 2001
From: Max Rothman <max@edx.org>
Date: Thu, 7 May 2015 15:47:48 -0400
Subject: [PATCH] Remove additional ec2_elb_local references
---
playbooks/edx-east/cluster_rabbitmq.yml | 4 ++--
playbooks/edx-east/commoncluster.yml | 4 ++--
playbooks/edx-east/edx_provision.yml | 2 +-
playbooks/edx-east/elasticsearch.yml | 4 ++--
playbooks/edx-east/rabbitmq.yml | 4 ++--
playbooks/edx-east/test-rolling.yml | 4 ++--
playbooks/edx-east/xqueue.yml | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/playbooks/edx-east/cluster_rabbitmq.yml b/playbooks/edx-east/cluster_rabbitmq.yml
index 43e0e37..f5aa750 100644
--- a/playbooks/edx-east/cluster_rabbitmq.yml
+++ b/playbooks/edx-east/cluster_rabbitmq.yml
@@ -17,7 +17,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Instance De-register
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
region: us-east-1
@@ -36,7 +36,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Register instance in the elb
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
ec2_elbs: "{{ item }}"
diff --git a/playbooks/edx-east/commoncluster.yml b/playbooks/edx-east/commoncluster.yml
index 8c29a86..a57338b 100644
--- a/playbooks/edx-east/commoncluster.yml
+++ b/playbooks/edx-east/commoncluster.yml
@@ -17,7 +17,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Instance De-register
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
region: us-east-1
@@ -44,7 +44,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Register instance in the elb
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
ec2_elbs: "{{ item }}"
diff --git a/playbooks/edx-east/edx_provision.yml b/playbooks/edx-east/edx_provision.yml
index fd9a168..22851a0 100644
--- a/playbooks/edx-east/edx_provision.yml
+++ b/playbooks/edx-east/edx_provision.yml
@@ -83,7 +83,7 @@
sudo: False
- name: register instance into an elb if one was provided
local_action:
- module: ec2_elb_local
+ module: ec2_elb
region: "{{ region }}"
instance_id: "{{ ec2_info.instance_ids[0] }}"
state: present
diff --git a/playbooks/edx-east/elasticsearch.yml b/playbooks/edx-east/elasticsearch.yml
index 96690a9..00ae72b 100644
--- a/playbooks/edx-east/elasticsearch.yml
+++ b/playbooks/edx-east/elasticsearch.yml
@@ -17,7 +17,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Instance De-register
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
region: us-east-1
@@ -33,7 +33,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Register instance in the elb
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
ec2_elbs: "{{ item }}"
diff --git a/playbooks/edx-east/rabbitmq.yml b/playbooks/edx-east/rabbitmq.yml
index 469c544..244ca2d 100644
--- a/playbooks/edx-east/rabbitmq.yml
+++ b/playbooks/edx-east/rabbitmq.yml
@@ -19,7 +19,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Instance De-register
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
region: us-east-1
@@ -34,7 +34,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Register instance in the elb
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
ec2_elbs: "{{ item }}"
diff --git a/playbooks/edx-east/test-rolling.yml b/playbooks/edx-east/test-rolling.yml
index cadc055..75877f2 100644
--- a/playbooks/edx-east/test-rolling.yml
+++ b/playbooks/edx-east/test-rolling.yml
@@ -14,7 +14,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Instance De-register
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
region: us-east-1
@@ -28,7 +28,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Register instance in the elb
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
ec2_elbs: "{{ item }}"
diff --git a/playbooks/edx-east/xqueue.yml b/playbooks/edx-east/xqueue.yml
index 8589e34..f4a4717 100644
--- a/playbooks/edx-east/xqueue.yml
+++ b/playbooks/edx-east/xqueue.yml
@@ -16,7 +16,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Instance De-register
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
region: us-east-1
@@ -42,7 +42,7 @@
- debug: var="{{ ansible_ec2_instance_id }}"
when: elb_pre_post
- name: Register instance in the elb
- local_action: ec2_elb_local
+ local_action: ec2_elb
args:
instance_id: "{{ ansible_ec2_instance_id }}"
ec2_elbs: "{{ item }}"
--
libgit2 0.26.0