fixed Invalid index issue when bastion is disabled

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

docs/terraformoptions.adoc

@@ -241,7 +241,7 @@ Configuration Terraform Options:
 |admin_image_id
 |Custom image id for the admin host
 |image_id/Oracle. If the value is set to Oracle, an Oracle Platform image will be used instead.
-|NONE
+|Oracle
 
 |enable_instance_principal
 |Whether to enable instance_principal on the admin server. Refer to {uri-instance-principal-note}[instance_principal][instance_principal]

modules/admin/compute.tf

@@ -29,7 +29,7 @@ resource "oci_core_instance" "admin" {
 
   source_details {
     source_type = "image"
-    source_id   = var.oci_admin.admin_image_id == "Oracle" ? data.oci_core_images.admin_images.images.0.id : var.oci_admin.admin_image_id
+    source_id   = local.admin_image_id
   }
 
   timeouts {

modules/admin/locals.tf

@@ -9,4 +9,5 @@ locals {
   anywhere      = "0.0.0.0/0"
   ssh_port      = 22
   tcp_protocol  = 6
+  admin_image_id = var.oci_admin.admin_image_id == "Oracle" ? data.oci_core_images.admin_images.images.0.id : var.oci_admin.admin_image_id
 }

modules/bastion/datasources.tf

@@ -27,7 +27,6 @@ data "oci_core_images" "autonomous_images" {
   operating_system_version = "7.7"
   shape                    = var.oci_bastion.bastion_shape
   sort_by                  = "TIMECREATED"
-  count                    = (var.oci_bastion.bastion_enabled == true && var.oci_bastion.bastion_image_id == "Autonomous") ? 1 : 0
 }
 
 # cloud init for bastion

modules/bastion/locals.tf

@@ -9,5 +9,5 @@ locals {
   anywhere         = "0.0.0.0/0"
   ssh_port         = 22
   tcp_protocol     = 6
-  bastion_image_id = var.oci_bastion.bastion_image_id == "Autonomous" ? data.oci_core_images.autonomous_images[0].images.0.id : var.oci_bastion.bastion_image_id
+  bastion_image_id = var.oci_bastion.bastion_image_id == "Autonomous" ? data.oci_core_images.autonomous_images.images.0.id : var.oci_bastion.bastion_image_id
 }