removed instance_principal check (#49)

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

Author: hyder

CHANGELOG.adoc

@@ -7,6 +7,9 @@ All notable changes to this project are documented in this file.
 
 The format is based on {uri-changelog}[Keep a Changelog].
 
+== 1.1.4 (May 5, 2020)
+* Removed instance_principal check (#48)
+
 == 1.1.3 (April 7, 2020)
 * Added a file (ip.finish) on admin host to allow solution stacks to detect when the instance_principal for admin host is ready (#46)
 

locals.tf

@@ -61,7 +61,6 @@ locals {
     admin_shape               = var.oci_base_admin.admin_shape
     admin_upgrade             = var.oci_base_admin.admin_upgrade
     enable_instance_principal = var.oci_base_admin.enable_instance_principal
-    ssh_private_key_path      = var.oci_base_admin.ssh_private_key_path
     ssh_public_key_path       = var.oci_base_admin.ssh_public_key_path
     timezone                  = var.oci_base_admin.timezone
   }

main.tf

@@ -24,6 +24,5 @@ module "admin" {
   oci_admin_network      = local.oci_admin_network
   oci_admin              = local.oci_admin
   oci_admin_notification = local.oci_admin_notification
-  oci_admin_bastion      = local.oci_admin_bastion
   tagging                = local.tagging
 }

modules/admin/instance_principal.tf

@@ -42,28 +42,4 @@ resource "oci_identity_policy" "admin_instance_principal" {
   statements     = ["Allow dynamic-group ${oci_identity_dynamic_group.admin_instance_principal[0].name} to manage all-resources in compartment id ${data.oci_identity_compartments.compartments_id.compartments.0.id}"]
 
   count = var.oci_admin.admin_enabled == true && var.oci_admin.enable_instance_principal == true ? 1 : 0
-}
-
-resource null_resource "instance_principal_complete" {
-  connection {
-    host        = oci_core_instance.admin[0].private_ip
-    private_key = file(var.oci_admin.ssh_private_key_path)
-    timeout     = "40m"
-    type        = "ssh"
-    user        = "opc"
-
-    bastion_host        = var.oci_admin_bastion.bastion_ip
-    bastion_user        = "opc"
-    bastion_private_key = file(var.oci_admin_bastion.ssh_private_key_path)
-  }
-
-  depends_on = [oci_identity_dynamic_group.admin_instance_principal, oci_identity_policy.admin_instance_principal]
-
-  provisioner "remote-exec" {
-    inline = [
-      "touch $HOME/ip.finish",
-    ]
-  }
-
-  count = var.oci_admin.admin_enabled == true && var.oci_admin.enable_instance_principal == true ? 1 : 0
-}
+}

modules/admin/variables.tf

@@ -32,7 +32,6 @@ variable "oci_admin" {
     admin_upgrade             = bool
     admin_enabled             = bool
     enable_instance_principal = bool
-    ssh_private_key_path      = string
     ssh_public_key_path       = string
     timezone                  = string
   })
@@ -68,12 +67,4 @@ variable "tagging" {
     computetag = map(any)
     networktag = map(any)
   })
-}
-
-# bastion
-variable "oci_admin_bastion" {
-  type = object({
-    bastion_ip           = string
-    ssh_private_key_path = string
-  })
-}
+}