rename http_service to web, added rules for Navi.

Christopher M. Neill · Christopher M. Neill · commit 2ca58d6656b6 · 2015-11-12T17:00:45.000-08:00
diff --git a/ansible/roles/aws_security_groups/templates/api.json b/ansible/roles/aws_security_groups/templates/api.json
@@ -30,10 +30,6 @@
                             "UserId": "{{ aws_accountid }}", 
                             "GroupId": "{{ sgid_api }}"
                         }, 
-                        {
-                            "UserId": "{{ aws_accountid }}", 
-                            "GroupId": "sg-d03671b4"
-                        }, 
                         {
                             "UserId": "{{ aws_accountid }}", 
                             "GroupId": "{{ sgid_docks }}"
@@ -81,10 +77,6 @@
                             "UserId": "{{ aws_accountid }}", 
                             "GroupId": "{{ sgid_api }}"
                         }, 
-                        {
-                            "UserId": "{{ aws_accountid }}", 
-                            "GroupId": "sg-d03671b4"
-                        }, 
                         {
                             "UserId": "{{ aws_accountid }}", 
                             "GroupId": "{{ sgid_docks }}"
@@ -106,10 +98,6 @@
                             "UserId": "{{ aws_accountid }}", 
                             "GroupId": "{{ sgid_api }}"
                         }, 
-                        {
-                            "UserId": "{{ aws_accountid }}", 
-                            "GroupId": "sg-d03671b4"
-                        }, 
                         {
                             "UserId": "{{ aws_accountid }}", 
                             "GroupId": "{{ sgid_docks }}"
diff --git a/ansible/roles/aws_security_groups/templates/hipache.json b/ansible/roles/aws_security_groups/templates/hipache.json
@@ -40,7 +40,7 @@
                         }, 
                         {
                             "UserId": "{{ aws_accountid }}", 
-                            "GroupId": "{{ sgid_http_service }}"
+                            "GroupId": "{{ sgid_web }}"
                         }, 
                         {
                             "UserId": "{{ aws_accountid }}", 
diff --git a/ansible/roles/aws_security_groups/templates/web.json b/ansible/roles/aws_security_groups/templates/web.json
@@ -66,7 +66,7 @@
             "GroupName": "{{ env_lc }}-http-service", 
             "VpcId": "{{ vpc_id }}", 
             "OwnerId": "{{ aws_accountid }}", 
-            "GroupId": "{{ sgid_http_service }}"
+            "GroupId": "{{ sgid_web }}"
         }
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"UserId": "{{ aws_accountid }}",`
`43`		`- "GroupId": "{{ sgid_http_service }}"`
	`43`	`+ "GroupId": "{{ sgid_web }}"`
`44`	`44`	`},`
`45`	`45`	`{`
`46`	`46`	`"UserId": "{{ aws_accountid }}",`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`"GroupName": "{{ env_lc }}-http-service",`
`67`	`67`	`"VpcId": "{{ vpc_id }}",`
`68`	`68`	`"OwnerId": "{{ aws_accountid }}",`
`69`		`- "GroupId": "{{ sgid_http_service }}"`
	`69`	`+ "GroupId": "{{ sgid_web }}"`
`70`	`70`	`}`
`71`	`71`	`]`
`72`	`72`	`}`