2 Commits
Author SHA1 Message Date
Curtis Wilson 7fa3088076 Added 'oracle-db' VM.
- Updated all AMIs that are not currently in use.
2022-06-07 13:04:26 -04:00
Curtis Wilson 36867e0ef2 Merge branch 'new-vpc' into 'checkin'
New VPC

See merge request ANDSAS/ops/terraform/nodes-terraform!1
2022-06-07 14:31:54 +00:00
2 changed files with 17 additions and 8 deletions
+13 -4
View File
@@ -45,7 +45,7 @@ locals {
subnet-ids = local.old-k8s-subnets-ids subnet-ids = local.old-k8s-subnets-ids
security-groups = [local.aws-managed-security-group-id] security-groups = [local.aws-managed-security-group-id]
disk-size = 32 disk-size = 32
num = 2 num = 0
}, },
"worker" = { "worker" = {
base-image = module.aws-ami-constants.ubuntu-ami base-image = module.aws-ami-constants.ubuntu-ami
@@ -53,7 +53,7 @@ locals {
subnet-ids = local.old-k8s-subnets-ids subnet-ids = local.old-k8s-subnets-ids
security-groups = [local.aws-managed-security-group-id] security-groups = [local.aws-managed-security-group-id]
disk-size = 64 disk-size = 64
num = 3 num = 4
}, },
"tst-master" = { "tst-master" = {
base-image = module.aws-ami-constants.ubuntu-ami base-image = module.aws-ami-constants.ubuntu-ami
@@ -76,7 +76,7 @@ locals {
subnet-ids = local.new-k8s-subnets-ids subnet-ids = local.new-k8s-subnets-ids
security-groups = [local.aws-mss-dev-security-group-id] security-groups = [local.aws-mss-dev-security-group-id]
disk-size = 64 disk-size = 64
num = 1 num = 3
}, },
"rancher-worker" = { "rancher-worker" = {
base-image = module.aws-ami-constants.ubuntu-ami base-image = module.aws-ami-constants.ubuntu-ami
@@ -84,7 +84,7 @@ locals {
subnet-ids = local.new-k8s-subnets-ids subnet-ids = local.new-k8s-subnets-ids
security-groups = [local.aws-mss-dev-security-group-id] security-groups = [local.aws-mss-dev-security-group-id]
disk-size = 64 disk-size = 64
num = 2 num = 4
}, },
"dev" = { "dev" = {
base-image = module.aws-ami-constants.ubuntu-ami base-image = module.aws-ami-constants.ubuntu-ami
@@ -116,6 +116,15 @@ locals {
private-ips = [var.aws-proxy-private-ip] private-ips = [var.aws-proxy-private-ip]
num = 1 num = 1
}, },
"oracle-db" = {
base-image = module.aws-ami-constants.rhel8-ami
aws-ec2-type = module.ec2-types.c5a-xlarge-amd-8gib-4vcpu
# subnet-ids = [module.aws-network-from-scratch.subnet.id]
subnet-ids = [module.aws-network-existing-mss-dev.subnet-by-name["mssdev Subnet 2"].id]
security-groups = [local.aws-mss-dev-security-group-id]
disk-size = 128
num = 1
},
} }
disks = { disks = {
+4 -4
View File
@@ -10,7 +10,7 @@ output "amzn2-ami" {
# us-east-2 # us-east-2
# default = "ami-0dd0ccab7e2801812" # default = "ami-0dd0ccab7e2801812"
# us-gov-west-1 # us-gov-west-1
value = "ami-02ab588324a95cf31" value = "ami-0281624483c624b77"
description = "The AMI to use for Amazon Linux 2." description = "The AMI to use for Amazon Linux 2."
} }
output "ubuntu-ami" { output "ubuntu-ami" {
@@ -39,20 +39,20 @@ output "rhel7-ami" {
# us-east-2 # us-east-2
# value = "ami-0a509b3c2a4d05b3f" # value = "ami-0a509b3c2a4d05b3f"
# us-gov-west-1 # us-gov-west-1
value = "ami-04ccdf5793086ea95" value = "ami-0783f30dbf99aa05d"
description = "The AMI to use for RHEL 7." description = "The AMI to use for RHEL 7."
} }
output "rhel8-ami" { output "rhel8-ami" {
# us-east-2 # us-east-2
# value = "ami-0d871ca8a77af2948" # value = "ami-0d871ca8a77af2948"
# us-gov-west-1 # us-gov-west-1
value = "ami-0b1f10cd1cd107dd2" value = "ami-04482d061459e6c32"
description = "The AMI to use for RHEL 8." description = "The AMI to use for RHEL 8."
} }
output "win-srv-2019-ami" { output "win-srv-2019-ami" {
# us-east-2 # us-east-2
# value = ??? # value = ???
# us-gov-west-1 # us-gov-west-1
value = "ami-0f838c3c35ab60fc4" value = "ami-070f960754631d355"
description = "The AMI to use for Windows Server 2019." description = "The AMI to use for Windows Server 2019."
} }