From 02fcb7b3ae4f73a16cbd9c497fb2f132ff4b36fa Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sun, 9 Jun 2024 11:12:53 -0700
Subject: [PATCH] feat(oci): move variables

---
 tf/oci_servers.tf        |  2 +-
 tf/oci_servers/common.tf | 12 ++++++++++++
 tf/oci_servers/micro.tf  | 12 ------------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tf/oci_servers.tf b/tf/oci_servers.tf
index b37e33ef..974ccc95 100644
--- a/tf/oci_servers.tf
+++ b/tf/oci_servers.tf
@@ -10,6 +10,6 @@ module "oci_servers" {
 
   tenancy_ocid        = module.oci_compartment_bootstrap.child_compartment_id
   nsg_id              = module.oci_common_private_network.nsg_id
-  ssh_authorized_keys = [var.kat_pgp_ssh_public_key]
+  ssh_authorized_keys = var.kat_pgp_ssh_public_key
   subnet_id           = module.oci_common_private_network.subnet_id
 }
\ No newline at end of file
diff --git a/tf/oci_servers/common.tf b/tf/oci_servers/common.tf
index 8405c6fc..aa5d9805 100644
--- a/tf/oci_servers/common.tf
+++ b/tf/oci_servers/common.tf
@@ -24,6 +24,18 @@ variable "tenancy_ocid" {
   type = string
 }
 
+variable "ssh_authorized_keys" {
+  type = string
+}
+
+variable "nsg_id" {
+  type = any
+}
+
+variable "subnet_id" {
+  type = any
+}
+
 data "oci_identity_availability_domains" "this" {
   compartment_id = var.tenancy_ocid
 }
diff --git a/tf/oci_servers/micro.tf b/tf/oci_servers/micro.tf
index c475017f..61797b66 100644
--- a/tf/oci_servers/micro.tf
+++ b/tf/oci_servers/micro.tf
@@ -30,18 +30,6 @@ variable "micro_display_names" {
   type = list(string)
 }
 
-variable "ssh_authorized_keys" {
-  type = list(string)
-}
-
-variable "nsg_id" {
-  type = any
-}
-
-variable "subnet_id" {
-  type = any
-}
-
 resource "oci_core_instance" "this" {
   count = 2