Ver código fonte

Merge pull request #97 from mdr-engineering/feature/bp_MSOCI-1455_migrate_salt_master_2

Switches salt-master DNS to legacy and sets up new salt-master DNS
Brad Poulton 4 anos atrás
pai
commit
18ea6c5e46

+ 2 - 2
prod/env.hcl

@@ -97,7 +97,7 @@ locals {
     #"vault-1" = "10.80.1.134",
     #"vault-2" = "10.80.2.236",
     #"vault-3" = "10.80.3.61",
-    "salt-master" = "10.80.101.170",
+    "salt-master-legacy" = "10.80.101.170",
   }
   legacy_private_cname_dns = {
     "iratemoses" = "internal-moose-internal-187462540.us-east-1.elb.amazonaws.com"
@@ -105,7 +105,7 @@ locals {
   legacy_public_dns = {
     "proxy" = "35.153.103.164",
     "reposerver" = "18.234.16.205",
-    "salt-master" = "52.5.165.105",
+    "salt-master-legacy" = "52.5.165.105",
     "sensu" = "52.6.95.246",
   }
   # cnames only

+ 1 - 1
test/aws-us-gov/mdr-test-c2/071-instance-salt-master/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master?ref=v0.9.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master?ref=v0.9.2"
 }
 
 dependency "vpc-access" {

+ 2 - 2
test/env.hcl

@@ -102,7 +102,7 @@ locals {
     #"vault-1" = "10.96.1.38",
     #"vault-2" = "10.96.2.63",
     #"vault-3" = "10.96.3.88",
-    "salt-master" = "10.96.101.161",
+    "salt-master-legacy" = "10.96.101.161",
   }
   legacy_private_cname_dns = {
     "iratemoses" = "internal-moose-internal-1036948608.us-east-1.elb.amazonaws.com."
@@ -111,7 +111,7 @@ locals {
   legacy_public_dns = {
     "proxy" = "18.214.39.158",
     "reposerver" = "34.202.16.40",
-    "salt-master" = "18.233.43.236",
+    "salt-master-legacy" = "18.233.43.236",
     "sensu" = "34.235.81.176"
   }
   # cnames only