Merge pull request #204 from nasa/release/1.0.0-rc.4.0

Update AMIs for 1.0.0-rc.4.0
nasa · Sep 4, 2022 · dad2722 · dad2722
2 parents 4fd33c1 + fe2979b
commit dad2722
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/cluster_provisioning/dev-e2e/variables.tf b/cluster_provisioning/dev-e2e/variables.tf
@@ -484,11 +484,11 @@ variable "earthdata_pass" {
 variable "amis" {
   type = map(string)
   default = {
-    # HySDS v4.0.1-beta.8-oraclelinux - Universal AMIs (June 24, 2022)
-    mozart    = "ami-07e0e84f9469ab0db" # mozart v4.17
-    metrics   = "ami-0846bd13fe529f806" # metrics v4.12
-    grq       = "ami-0b3852a0f65efed65" # grq v4.13
-    factotum  = "ami-00be11af7135dc5c3" # factotum v4.13
+    # HySDS v4.0.1-beta.8-oraclelinux - Universal AMIs (8-26-22)
+    mozart    = "ami-0f23130e8f63ede5d" # mozart v4.18
+    metrics   = "ami-01d55d43dda66391a" # metrics v4.13
+    grq       = "ami-04f57d54765bea834" # grq v4.14
+    factotum  = "ami-0d5f96008afa14416" # factotum v4.14
     autoscale = "ami-0d5a7f80daf236d93" # verdi v4.12 patchdate - 220609
     ci        = "ami-0d5a7f80daf236d93" # verdi v4.12 patchdate - 220609
   }

diff --git a/cluster_provisioning/modules/common/variables.tf b/cluster_provisioning/modules/common/variables.tf
@@ -132,22 +132,13 @@ variable "purge_es_snapshot" {
 variable "amis" {
   type = map(string)
   default = {
-	    # HySDS v4.0.1-beta.8-oraclelinux - Universal AMIs (June 24, 2022)
-#    mozart    = "ami-07e0e84f9469ab0db" # mozart v4.17
-#    metrics   = "ami-0846bd13fe529f806" # metrics v4.12
-#    grq       = "ami-0b3852a0f65efed65" # grq v4.13
-#    factotum  = "ami-00be11af7135dc5c3" # factotum v4.13
-#    autoscale = "ami-0d5a7f80daf236d93" # verdi v4.12 patchdate - 220609
-#    ci        = "ami-0d5a7f80daf236d93" # verdi v4.12 patchdate - 220609
-
     # HySDS v4.0.1-beta.8-oraclelinux - Universal AMIs (8-26-22)
     mozart    = "ami-0f23130e8f63ede5d" # mozart v4.18
     metrics   = "ami-01d55d43dda66391a" # metrics v4.13
     grq       = "ami-04f57d54765bea834" # grq v4.14
     factotum  = "ami-0d5f96008afa14416" # factotum v4.14
     autoscale = "ami-0d5a7f80daf236d93" # verdi v4.12 patchdate - 220609
     ci        = "ami-0d5a7f80daf236d93" # verdi v4.12 patchdate - 220609
-
   }
 }