trailing variables and outputs after switch to admin server

Author: hyder

modules/base/bastion/outputs.tf

@@ -3,8 +3,4 @@
 
 output "bastion_public_ip" {
   value = join(",", data.oci_core_vnic.bastion_vnic.*.public_ip_address)
-}
-
-output "bastion_instance_principal_group_name" {
-  value = (var.oci_bastion.enable_instance_principal == true) ? oci_identity_dynamic_group.bastion_instance_principal[0].name : null
-}
+}

modules/policies/groups.tf

@@ -59,5 +59,5 @@ resource null_resource "update_dynamic_group" {
     ]
   }
 
-  count = (var.oke_kms.use_encryption == true && var.bastion.create_bastion == true && var.bastion.enable_instance_principal == true) ? 1 : 0
+  count = (var.oke_kms.use_encryption == true && var.admin.bastion_enabled == true && var.admin.admin_instance_principal == true) ? 1 : 0
 }

modules/policies/policies.tf

@@ -7,7 +7,7 @@ resource "oci_identity_policy" "admin_instance_principal_dynamic_group" {
   description    = "policy to allow admin host to manage dynamic group"
   name           = "${var.label_prefix}-admin-instance-principal-dynamic-group"
   statements     = ["Allow dynamic-group ${var.dynamic_group} to use dynamic-groups in tenancy"]
-  count          = (var.oke_kms.use_encryption == true && var.bastion.create_bastion == true && var.bastion.enable_instance_principal == true) ? 1 : 0
+  count          = (var.oke_kms.use_encryption == true && var.admin.bastion_enabled == true && var.admin.admin_instance_principal == true) ? 1 : 0
 }
 
 resource "oci_identity_policy" "oke-kms" {

modules/policies/variables.tf

@@ -27,10 +27,10 @@ variable "label_prefix" {}
 
 variable "admin" {
   type = object({
-    bastion_public_ip               = string
-    admin_private_ip                = string
-    bastion_enabled                  = bool
-    admin_enabled                    = bool
+    bastion_public_ip        = string
+    admin_private_ip         = string
+    bastion_enabled          = bool
+    admin_enabled            = bool
     admin_instance_principal = bool
   })
 }