소스 검색

Minor Fixes During AWS Scheduler Deployments

Fixes minor issues while going through and updating all instances to
have proper 'Schedule' tag.

* Fixes minor issue with Interconnects not creating the defualt security
  group
* Makes the dns resolvers have a default key, removing the fdamstra
  configuration.
Fred Damstra 4 년 전
부모
커밋
47c9cd8e0c
2개의 변경된 파일11개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      base/dns/resolver_instance/vars.tf
  2. 6 0
      base/interconnects/main.tf

+ 5 - 1
base/dns/resolver_instance/vars.tf

@@ -22,10 +22,14 @@ variable "reverse_enabled" {
   default = true
 }
 
+variable "resolver_instance_key_name" {
+  type = string 
+  default = "msoc-build"
+}
+
 variable "proxy_ip" { type = string }
 variable "salt_master_ip" { type = string }
 variable "cidr_map" { type = map }
-variable "resolver_instance_key_name" { type = string }
 variable "dns_info" { type = map }
 variable "standard_tags" { type = map }
 variable "environment" { type = string }

+ 6 - 0
base/interconnects/main.tf

@@ -4,6 +4,11 @@ resource "aws_placement_group" "interconnects" {
   strategy = "spread"
 }
 
+data "aws_security_group" "aws_endpoints_sg" {
+  name   = "aws_endpoints"
+  vpc_id = var.security_vpc
+}
+
 module "typical_host_security_group" {
   source = "../../submodules/security_group/typical_host"
 
@@ -12,6 +17,7 @@ module "typical_host_security_group" {
   tags = merge(var.standard_tags, var.tags)
   aws_region = var.aws_region
   aws_partition = var.aws_partition
+  aws_endpoints_sg = data.aws_security_group.aws_endpoints_sg.id
 }
 
 resource "aws_network_interface" "interconnects" {