Merge pull request #116 from oracle-quickstart/topic_review_comment_fix

Fixed review comments for FSS changes

Author: abhijit-paranjpe

terraform/data_sources.tf

@@ -116,19 +116,10 @@ data "oci_file_storage_mount_targets" "mount_targets" {
   id                  = var.mount_target_id
 }
 
-
-data "oci_file_storage_mount_targets" "existing_mount_target" {
-  count = var.existing_fss_id != "" ? 1 : 0
-  #Required
-  availability_domain = local.fss_availability_domain
-  compartment_id      = var.mount_target_compartment_id
-  id                  = var.mount_target_id
-}
-
 data "oci_core_private_ip" "mount_target_private_ips" {
   count = var.existing_fss_id != "" ? 1 : 0
   #Required
-  private_ip_id = data.oci_file_storage_mount_targets.existing_mount_target[0].mount_targets[0].private_ip_ids[0]
+  private_ip_id = data.oci_file_storage_mount_targets.mount_targets[0].mount_targets[0].private_ip_ids[0]
 }
 
 data "oci_apm_apm_domain" "apm_domain" {
@@ -151,13 +142,6 @@ data "oci_core_subnet" "mount_target_existing_subnet" {
   subnet_id = data.oci_file_storage_mount_targets.mount_targets[0].mount_targets[0].subnet_id
 }
 
-data "oci_core_subnet" "mount_target_existing_subnet_by_fss" {
-  count = var.existing_fss_id == "" ? 0 : 1
-
-  #Required
-  subnet_id = data.oci_file_storage_mount_targets.existing_mount_target[0].mount_targets[0].subnet_id
-}
-
 data "oci_objectstorage_namespace" "object_namespace" {
 
   #Optional

terraform/main.tf

@@ -558,7 +558,7 @@ module "compute" {
   wls_domain_name               = format("%s_domain", local.service_name_prefix)
   wls_server_startup_args       = var.wls_server_startup_args
   wls_existing_vcn_id           = var.wls_existing_vcn_id
-  mount_vcn_id                  = var.mount_target_id != "" ? data.oci_core_subnet.mount_target_existing_subnet[0].vcn_id : (var.existing_fss_id != "" ? data.oci_core_subnet.mount_target_existing_subnet_by_fss[0].vcn_id : "")
+  mount_vcn_id                  = var.mount_target_id != "" ? data.oci_core_subnet.mount_target_existing_subnet[0].vcn_id : ""
   wls_vcn_cidr                  = var.wls_vcn_cidr != "" ? var.wls_vcn_cidr : element(concat(module.network-vcn.*.vcn_cidr, tolist([""])), 0)
   wls_version                   = var.wls_version
   wls_edition                   = var.wls_edition

terraform/outputs.tf

@@ -18,7 +18,7 @@ output "fss_system_id" {
 }
 
 output "mount_target_id" {
-  value = var.mount_target_id != "" ? var.mount_target_id : var.existing_fss_id != "" ? data.oci_file_storage_mount_targets.existing_mount_target[0].mount_targets[0].id : (var.add_fss ? module.fss[0].mount_target_id : "")
+  value = var.add_fss? (var.mount_target_id != ""? var.mount_target_id: module.fss[0].mount_target_id):""
 }
 
 output "load_balancer_id" {