Merge pull request #12 from poanetwork/remove-redis
Remove Redis/ElastiCache
This commit is contained in:
commit
5e53ec3b3b
|
@ -20,7 +20,6 @@ module "stack" {
|
||||||
public_subnet_cidr = "${var.public_subnet_cidr}"
|
public_subnet_cidr = "${var.public_subnet_cidr}"
|
||||||
instance_type = "${var.instance_type}"
|
instance_type = "${var.instance_type}"
|
||||||
db_subnet_cidr = "${var.db_subnet_cidr}"
|
db_subnet_cidr = "${var.db_subnet_cidr}"
|
||||||
redis_subnet_cidr = "${var.redis_subnet_cidr}"
|
|
||||||
dns_zone_name = "${var.dns_zone_name}"
|
dns_zone_name = "${var.dns_zone_name}"
|
||||||
|
|
||||||
db_id = "${var.db_id}"
|
db_id = "${var.db_id}"
|
||||||
|
|
|
@ -18,11 +18,6 @@ variable "db_subnet_cidr" {
|
||||||
default = "10.0.1.0/16"
|
default = "10.0.1.0/16"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "redis_subnet_cidr" {
|
|
||||||
description = "The CIDR block for the redis subnet"
|
|
||||||
default = "10.0.128.0/24"
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "dns_zone_name" {
|
variable "dns_zone_name" {
|
||||||
description = "The internal DNS name"
|
description = "The internal DNS name"
|
||||||
default = "poa.internal"
|
default = "poa.internal"
|
||||||
|
|
|
@ -12,18 +12,6 @@ resource "aws_ssm_parameter" "new_relic_license_key" {
|
||||||
type = "String"
|
type = "String"
|
||||||
}
|
}
|
||||||
|
|
||||||
locals {
|
|
||||||
redis_host = "${aws_elasticache_cluster.default.cache_nodes.0.address}"
|
|
||||||
redis_port = "${aws_elasticache_cluster.default.cache_nodes.0.port}"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "aws_ssm_parameter" "redis_url" {
|
|
||||||
count = "${length(var.chains)}"
|
|
||||||
name = "/${var.prefix}/${element(keys(var.chains),count.index)}/redis_url"
|
|
||||||
value = "redis://${local.redis_host}:${local.redis_host}/${var.prefix}"
|
|
||||||
type = "String"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "aws_ssm_parameter" "pool_size" {
|
resource "aws_ssm_parameter" "pool_size" {
|
||||||
count = "${length(var.chains)}"
|
count = "${length(var.chains)}"
|
||||||
name = "/${var.prefix}/${element(keys(var.chains),count.index)}/pool_size"
|
name = "/${var.prefix}/${element(keys(var.chains),count.index)}/pool_size"
|
||||||
|
|
|
@ -67,7 +67,6 @@ resource "aws_autoscaling_group" "explorer" {
|
||||||
depends_on = [
|
depends_on = [
|
||||||
"aws_ssm_parameter.new_relic_app_name",
|
"aws_ssm_parameter.new_relic_app_name",
|
||||||
"aws_ssm_parameter.new_relic_license_key",
|
"aws_ssm_parameter.new_relic_license_key",
|
||||||
"aws_ssm_parameter.redis_url",
|
|
||||||
"aws_ssm_parameter.pool_size",
|
"aws_ssm_parameter.pool_size",
|
||||||
"aws_ssm_parameter.ecto_use_ssl",
|
"aws_ssm_parameter.ecto_use_ssl",
|
||||||
"aws_ssm_parameter.exq_blocks_concurrency",
|
"aws_ssm_parameter.exq_blocks_concurrency",
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
resource "aws_elasticache_cluster" "default" {
|
|
||||||
cluster_id = "${var.prefix}-explorer-redis"
|
|
||||||
engine = "redis"
|
|
||||||
node_type = "cache.m4.large"
|
|
||||||
num_cache_nodes = 1
|
|
||||||
parameter_group_name = "default.redis3.2"
|
|
||||||
port = 6379
|
|
||||||
security_group_ids = ["${aws_security_group.redis.id}"]
|
|
||||||
availability_zone = "${data.aws_availability_zones.available.names[0]}"
|
|
||||||
subnet_group_name = "${aws_elasticache_subnet_group.redis.id}"
|
|
||||||
|
|
||||||
tags {
|
|
||||||
prefix = "${var.prefix}"
|
|
||||||
origin = "terraform"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "aws_elasticache_subnet_group" "redis" {
|
|
||||||
name = "${var.prefix}-redis-subnet-group"
|
|
||||||
subnet_ids = ["${aws_subnet.redis.id}"]
|
|
||||||
}
|
|
|
@ -250,30 +250,3 @@ resource "aws_security_group" "database" {
|
||||||
origin = "terraform"
|
origin = "terraform"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "aws_security_group" "redis" {
|
|
||||||
name = "${var.prefix}-poa-redis"
|
|
||||||
description = "Allow any inbound traffic from public/private subnet"
|
|
||||||
vpc_id = "${aws_vpc.vpc.id}"
|
|
||||||
|
|
||||||
# Allow traffic from within app server subnet
|
|
||||||
ingress {
|
|
||||||
from_port = 6379
|
|
||||||
to_port = 6379
|
|
||||||
protocol = "tcp"
|
|
||||||
cidr_blocks = ["${var.public_subnet_cidr}"]
|
|
||||||
}
|
|
||||||
|
|
||||||
# Unrestricted outbound
|
|
||||||
egress {
|
|
||||||
from_port = 0
|
|
||||||
to_port = 0
|
|
||||||
protocol = "-1"
|
|
||||||
cidr_blocks = ["0.0.0.0/0"]
|
|
||||||
}
|
|
||||||
|
|
||||||
tags {
|
|
||||||
prefix = "${var.prefix}"
|
|
||||||
origin = "terraform"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -13,20 +13,6 @@ resource "aws_subnet" "default" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
## Redis subnet
|
|
||||||
resource "aws_subnet" "redis" {
|
|
||||||
vpc_id = "${aws_vpc.vpc.id}"
|
|
||||||
cidr_block = "${var.redis_subnet_cidr}"
|
|
||||||
availability_zone = "${data.aws_availability_zones.available.names[0]}"
|
|
||||||
map_public_ip_on_launch = false
|
|
||||||
|
|
||||||
tags {
|
|
||||||
name = "${var.prefix}-redis-subnet"
|
|
||||||
prefix = "${var.prefix}"
|
|
||||||
origin = "terraform"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
## Database subnet
|
## Database subnet
|
||||||
resource "aws_subnet" "database" {
|
resource "aws_subnet" "database" {
|
||||||
count = "${length(data.aws_availability_zones.available.names)}"
|
count = "${length(data.aws_availability_zones.available.names)}"
|
||||||
|
|
|
@ -4,7 +4,6 @@ variable "key_name" {}
|
||||||
variable "vpc_cidr" {}
|
variable "vpc_cidr" {}
|
||||||
variable "public_subnet_cidr" {}
|
variable "public_subnet_cidr" {}
|
||||||
variable "db_subnet_cidr" {}
|
variable "db_subnet_cidr" {}
|
||||||
variable "redis_subnet_cidr" {}
|
|
||||||
variable "dns_zone_name" {}
|
variable "dns_zone_name" {}
|
||||||
variable "instance_type" {}
|
variable "instance_type" {}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue