Commit 76cfc5d8 by Feanil Patel

Merge pull request #687 from edx/e0d/more-specific-subnet-tags

and env and deployment to the purpose in asgard tag.
parents 0da8d758 0149b5d6
...@@ -516,8 +516,17 @@ ...@@ -516,8 +516,17 @@
"Tags":[ "Tags":[
{ {
"Key":"immutable_metadata", "Key":"immutable_metadata",
"Value":"{'purpose':'external','target':'ec2'}" "Value":{"Fn::Join":["",
} ["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"external','target':'ec2'}"
]
]
}
}
] ]
} }
}, },
...@@ -543,8 +552,17 @@ ...@@ -543,8 +552,17 @@
}, },
"Tags":[ "Tags":[
{ {
"Key":"immutable_metadata", "Key":"immutable_metadata",
"Value":"{'purpose':'external','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"external','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -612,7 +630,16 @@ ...@@ -612,7 +630,16 @@
}, },
{ {
"Key":"immutable_metadata", "Key":"immutable_metadata",
"Value":"{'purpose':'internal-edxapp','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-edxapp','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -648,7 +675,16 @@ ...@@ -648,7 +675,16 @@
}, },
{ {
"Key":"immutable_metadata", "Key":"immutable_metadata",
"Value":"{'purpose':'internal-edxapp','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-edxapp','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -683,8 +719,17 @@ ...@@ -683,8 +719,17 @@
"Value":"Private" "Value":"Private"
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-xqueue','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xqueue','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -720,7 +765,16 @@ ...@@ -720,7 +765,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-xqueue','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xqueue','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -756,7 +810,16 @@ ...@@ -756,7 +810,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-rabbit','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-rabbit','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -791,8 +854,17 @@ ...@@ -791,8 +854,17 @@
"Value":"Private" "Value":"Private"
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-rabbit','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-rabbit','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -828,7 +900,16 @@ ...@@ -828,7 +900,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-xserver','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xserver','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -864,7 +945,16 @@ ...@@ -864,7 +945,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-xserver','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-xserver','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1028,7 +1118,16 @@ ...@@ -1028,7 +1118,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-worker','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-worker','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1064,7 +1163,16 @@ ...@@ -1064,7 +1163,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-worker','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-worker','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1100,7 +1208,16 @@ ...@@ -1100,7 +1208,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-elasticsearch','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-elasticsearch','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1136,7 +1253,16 @@ ...@@ -1136,7 +1253,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-elasticsearch','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-elasticsearch','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1172,7 +1298,16 @@ ...@@ -1172,7 +1298,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-forum','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-forum','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1208,7 +1343,16 @@ ...@@ -1208,7 +1343,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-forum','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-forum','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1244,7 +1388,16 @@ ...@@ -1244,7 +1388,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-mongo','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1280,7 +1433,16 @@ ...@@ -1280,7 +1433,16 @@
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-mongo','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
} }
] ]
} }
...@@ -1315,8 +1477,17 @@ ...@@ -1315,8 +1477,17 @@
"Value":"Private" "Value":"Private"
}, },
{ {
"Key" : "immutable_metadata", "Key" : "immutable_metadata",
"Value" : "{'purpose':'internal-mongo','target':'ec2'}" "Value":{"Fn::Join":["",
["{'purpose':'",
{"Ref":"EnvironmentTag"},
"-",
{"Ref":"DeploymentTag"},
"-",
"internal-mongo','target':'ec2'}"
]
]
}
} }
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment