From a1e554e6a1adf03e0f5b4e0f08967535655fdf76 Mon Sep 17 00:00:00 2001
From: mikhail <mikhaila@thoughworks.com>
Date: Thu, 4 Aug 2016 20:06:29 +0530
Subject: [PATCH] Revert "Allowing access from dev box IP"

This reverts commit 773441d56e4c5e19b41e4958c8d7c0920f48a35a.
---
 .gitignore                     |  1 -
 files/ec2_group_facts.py       | 34 ----------------------------------
 tasks/get_instance_details.yml |  2 +-
 tasks/get_my_ip.yml            |  7 -------
 tasks/main.yml                 |  6 ------
 tasks/start/open_access.yml    | 19 -------------------
 vars/main.yml                  | 13 +------------
 7 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 files/ec2_group_facts.py
 delete mode 100644 tasks/get_my_ip.yml
 delete mode 100644 tasks/start/open_access.yml

diff --git a/.gitignore b/.gitignore
index c0295df..e43b0f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 .DS_Store
-files/existing_security_groups_*.json
diff --git a/files/ec2_group_facts.py b/files/ec2_group_facts.py
deleted file mode 100644
index 751f44e..0000000
--- a/files/ec2_group_facts.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import sys
-import json
-import re
-from boto.ec2 import EC2Connection
-
-
-def get_security_group_rules_as_dict(rules):
-    security_group_rules = []
-    for rule in rules:
-        rule_dict = {'proto': str(rule.ip_protocol), 'from_port': rule.from_port, 'to_port': rule.to_port}
-        for grant in rule.grants:
-            rule_dict_with_source = rule_dict
-            if re.search("sg-", str(grant)):
-                rule_dict_with_source['group_name'] = str(grant)
-            else:
-                rule_dict_with_source['cidr_ip'] = str(grant)
-            security_group_rules.append(rule_dict_with_source)
-    return security_group_rules
-
-ec2_connection = EC2Connection()
-group_id = sys.argv[1]
-security_group = ec2_connection.get_all_security_groups(group_ids=[group_id])
-
-security_group_details = dict()
-security_group_details["id"] = security_group[0].id
-security_group_details["tag"] = security_group[0].tags
-security_group_details["name"] = security_group[0].name
-security_group_details["description"] = security_group[0].description
-security_group_details["vpc_id"] = security_group[0].vpc_id
-security_group_details["rules"] = get_security_group_rules_as_dict(security_group[0].rules)
-security_group_details["rules_egress"] = get_security_group_rules_as_dict(security_group[0].rules_egress)
-
-print json.dumps(security_group_details)
-
diff --git a/tasks/get_instance_details.yml b/tasks/get_instance_details.yml
index b387bfe..fd92191 100644
--- a/tasks/get_instance_details.yml
+++ b/tasks/get_instance_details.yml
@@ -1,6 +1,6 @@
 
 - name: Format instance selection tags for ec2_remote_facts
-  command: python {{roles_directory}}/ec2-start-stop/files/build_tags_dict.py "{{instances.tags}}"
+  command: python roles/ec2-start-stop/files/build_tags_dict.py "{{instances.tags}}"
   register: ec2_remote_tags
 
 - name: Get instance_ids
diff --git a/tasks/get_my_ip.yml b/tasks/get_my_ip.yml
deleted file mode 100644
index a5fdbb4..0000000
--- a/tasks/get_my_ip.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: Get my ip
-  shell: "curl -s https://ipinfo.io/ip"
-  register: local_ip
-
-- name: Set fact for obtained ip
-  set_fact:
-    my_ip: "{{local_ip.stdout}}/32"
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index 987ba06..ab2a771 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -19,9 +19,3 @@
 - name: Stop instances
   include: stop/stop_instances.yml
   when: action == "stop"
-
-- name: Open access to my IP
-  include: start/open_access.yml
-  when: action == "start" and instances.security_group is defined
-
-
diff --git a/tasks/start/open_access.yml b/tasks/start/open_access.yml
deleted file mode 100644
index 10046af..0000000
--- a/tasks/start/open_access.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-- name: Get security group facts
-  command: "python {{roles_directory}}/ec2-start-stop/files/ec2_group_facts.py {{item.id}}"
-  with_items: "{{instances_details.instances|map(attribute='groups')|list|unique}}"
-  register: security_groups
-
-- set_fact:
-    existing_security_group: "{{security_groups.results|map(attribute='stdout')|list|min}}"
-
-- name: Store existing security group
-  copy: content="{{existing_security_group}}" dest="{{roles_directory}}/ec2-start-stop/files/existing_security_groups_{{existing_security_group.id}}.json" mode=0644
-
-- ec2_group:
-    name: "{{ existing_security_group.name }}"
-    description: "{{ existing_security_group.description }}"
-    rules: "{{instances.security_group.rules}}"
-    rules_egress: "{{instances.security_group.rules_egress}}"
-    purge_rules: no
-    purge_rules_egress: no
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
index c111476..f0b4a1c 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -4,15 +4,4 @@
 instances:
   tags:
     Environment: 'Dev'
-  elastic_ip: "yes"
-  security_group:
-    rules:
-    - proto: tcp
-      from_port: 80
-      to_port: 80
-      cidr_ip: "{{my_ip}}"
-    - proto: tcp
-      from_port: 443
-      to_port: 443
-      cidr_ip: "{{my_ip}}"
-    rules_egress: []
+  elastic_ip: "yes"
\ No newline at end of file