Merge pull request #866 from DrixTabligan-NOAA/ec2-imagebuilder-updates

Ec2 imagebuilder updates
NOAA-OWP · Oct 23, 2024 · 8a0e05e · 8a0e05e
2 parents 5d0ada9 + b69239f
commit 8a0e05e
Show file tree

Hide file tree

Showing 12 changed files with 160 additions and 174 deletions.
diff --git a/Core/.terraform.lock.hcl b/Core/.terraform.lock.hcl
diff --git a/Core/ImageBuilder/Pipelines/egis-servers/arcgisenterprise-pipeline.tf b/Core/ImageBuilder/Pipelines/egis-servers/arcgisenterprise-pipeline.tf
@@ -31,7 +31,7 @@ resource "aws_imagebuilder_image_pipeline" "arcgis_enterprise" {
 
 resource "aws_imagebuilder_image_recipe" "arcgisenterprise_recipe" {
   name         = "arcgisenterprise-${local.arcgisVersionName}-recipe"
-  parent_image = "arn:aws:imagebuilder:${var.region}:aws:image/windows-server-2019-english-full-base-x86/x.x.x"
+  parent_image = "arn:aws:imagebuilder:${var.region}:aws:image/windows-server-2022-english-full-base-x86/x.x.x"
   version      = local.image_version
   tags         = local.shared_tags
 
@@ -105,15 +105,12 @@ resource "aws_imagebuilder_image_recipe" "arcgisenterprise_recipe" {
 resource "aws_imagebuilder_distribution_configuration" "arcgisenterprise-distribution" {
   name = "arcgisenterprise-${local.arcgisVersionName}-distribution"
 
-  dynamic "distribution" {
-    for_each = local.destination_aws_regions
-    content {
-      region = distribution.value
-      ami_distribution_configuration {
-        name               = "arcgisenterprise-${local.arcgisVersionName}-{{ imagebuilder:buildDate }}"
-        target_account_ids = var.ami_sharing_account_ids
-        ami_tags           = merge(data.aws_default_tags.default.tags, { Name = "arcgisenterprise-${local.arcgisVersionName}-distribution" }, local.shared_tags)
-      }
+  distribution {
+    region = "us-east-1"
+    ami_distribution_configuration {
+      name               = "arcgisenterprise-${local.arcgisVersionName}-{{ imagebuilder:buildDate }}"
+      target_account_ids  = ["226711853580"]
+      ami_tags           = merge(data.aws_default_tags.default.tags, { Name = "arcgisenterprise-${local.arcgisVersionName}-distribution" }, local.shared_tags)
     }
   }
 }
diff --git a/Core/ImageBuilder/Pipelines/egis-servers/arcgisserver-pipeline.tf b/Core/ImageBuilder/Pipelines/egis-servers/arcgisserver-pipeline.tf
@@ -31,7 +31,7 @@ resource "aws_imagebuilder_image_pipeline" "arcgis_server" {
 
 resource "aws_imagebuilder_image_recipe" "arcgisserver_recipe" {
   name         = "arcgisserver-${local.arcgisVersionName}-recipe"
-  parent_image = "arn:aws:imagebuilder:${var.region}:aws:image/windows-server-2019-english-full-base-x86/x.x.x"
+  parent_image = "arn:aws:imagebuilder:${var.region}:aws:image/windows-server-2022-english-full-base-x86/x.x.x"
   version      = local.image_version
   tags         = local.shared_tags
 
@@ -105,15 +105,12 @@ resource "aws_imagebuilder_image_recipe" "arcgisserver_recipe" {
 resource "aws_imagebuilder_distribution_configuration" "arcgisserver-distribution" {
   name = "arcgisserver-${local.arcgisVersionName}-distribution"
 
-  dynamic "distribution" {
-    for_each = local.destination_aws_regions
-    content {
-      region = distribution.value
-      ami_distribution_configuration {
-        name               = "arcgisserver-${local.arcgisVersionName}-{{ imagebuilder:buildDate }}"
-        target_account_ids = var.ami_sharing_account_ids
-        ami_tags           = merge(data.aws_default_tags.default.tags, { Name = "arcgisserver-${local.arcgisVersionName}-distribution" }, local.shared_tags)
-      }
+  distribution {
+    region = "us-east-1"
+    ami_distribution_configuration {
+      name                = "arcgisserver-${local.arcgisVersionName}-{{ imagebuilder:buildDate }}"
+      target_account_ids  = ["226711853580"]  
+      ami_tags            = merge(data.aws_default_tags.default.tags, { Name = "arcgisserver-${local.arcgisVersionName}-distribution" }, local.shared_tags)
     }
   }
 }

diff --git a/Core/ImageBuilder/Pipelines/egis-servers/configs/install-arcgis-enterprise-base.json b/Core/ImageBuilder/Pipelines/egis-servers/configs/install-arcgis-enterprise-base.json
@@ -1,6 +1,6 @@
 {
   "arcgis": {
-    "version": "11.1",
+    "version": "11.3",
     "run_as_user": "arcgis",
     "run_as_password": "p@@ssw0rd!123",
     "configure_windows_firewall": true,
@@ -16,7 +16,7 @@
     },
     "web_adaptor": {
       "install_system_requirements": true,
-      "dotnet_setup_path": "C:\\software\\dotnet-hosting-6.0.9-win.exe",
+      "dotnet_setup_path": "C:\\software\\dotnet-hosting-8.0.8-win.exe",
       "web_deploy_setup_path": "C:\\software\\WebDeploy_amd64_en-US.msi",
       "admin_access": true,
       "reindex_portal_content": false

diff --git a/Core/ImageBuilder/Pipelines/egis-servers/configs/install-arcgis-server.json b/Core/ImageBuilder/Pipelines/egis-servers/configs/install-arcgis-server.json
@@ -1,12 +1,12 @@
 {
   "arcgis": {
-    "version": "11.1",
+    "version": "11.3",
     "run_as_user": "arcgis",
     "run_as_password": "p@@ssw0rd!123",
     "configure_windows_firewall": true,
     "repository": {
       "local_archives": "C:\\software",
-      "archives": "C:\\software",      
+      "archives": "C:\\software",
       "setups": "C:\\software"
     },
     "server": {
@@ -16,7 +16,7 @@
     },
     "web_adaptor": {
       "install_system_requirements": true,
-      "dotnet_setup_path": "C:\\software\\dotnet-hosting-6.0.9-win.exe",
+      "dotnet_setup_path": "C:\\software\\dotnet-hosting-8.0.8-win.exe",
       "web_deploy_setup_path": "C:\\software\\WebDeploy_amd64_en-US.msi",
       "admin_access": true,
       "reindex_portal_content": false